Match the exports ordinals to PowerVR.

BUG=18110152

Change-Id: I6152faa4c5717fdb34e10b9d8f5b531683886910
Reviewed-on: https://swiftshader-review.googlesource.com/1280
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/GLES2/libGLES_CM/libGLES_CM.cpp b/src/GLES2/libGLES_CM/libGLES_CM.cpp
index 6d71b43..1033613 100644 (file)
--- a/src/GLES2/libGLES_CM/libGLES_CM.cpp
+++ b/src/GLES2/libGLES_CM/libGLES_CM.cpp
@@ -20,9 +20,14 @@
 #include "Texture.h"\r
 #include "Query.h"\r
 #include "common/debug.h"\r
+#include "Common/SharedLibrary.hpp"\r
 #include "Common/Version.h"\r
 #include "Main/Register.hpp"\r
 \r
+#define EGLAPI\r
+#include <EGL/egl.h>\r
+#include <EGL/eglext.h>\r
+\r
 #define GL_API\r
 #include <GLES/gl.h>\r
 #define GL_GLEXT_PROTOTYPES\r
@@ -120,6 +125,222 @@ static bool validReadFormatType(GLenum format, GLenum type)
 extern "C"\r
 {\r
 \r
+EGLint EGLAPIENTRY eglGetError(void)\r
+{\r
+       static auto eglGetError = (EGLint (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglGetError");\r
+       return eglGetError();\r
+}\r
+\r
+EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)\r
+{\r
+    static auto eglGetDisplay = (EGLDisplay (EGLAPIENTRY*)(EGLNativeDisplayType display_id))getProcAddress(libEGL, "eglGetDisplay");\r
+       return eglGetDisplay(display_id);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)\r
+{\r
+    static auto eglInitialize = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLint *major, EGLint *minor))getProcAddress(libEGL, "eglInitialize");\r
+       return eglInitialize(dpy, major, minor);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)\r
+{\r
+    static auto eglTerminate = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy))getProcAddress(libEGL, "eglTerminate");\r
+       return eglTerminate(dpy);\r
+}\r
+\r
+const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)\r
+{\r
+    static auto eglQueryString = (const char *(EGLAPIENTRY*)(EGLDisplay dpy, EGLint name))getProcAddress(libEGL, "eglQueryString");\r
+       return eglQueryString(dpy, name);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)\r
+{\r
+    static auto eglGetConfigs = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config))getProcAddress(libEGL, "eglGetConfigs");\r
+       return eglGetConfigs(dpy, configs, config_size, num_config);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)\r
+{\r
+    static auto eglChooseConfig = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config))getProcAddress(libEGL, "eglChooseConfig");\r
+       return eglChooseConfig(dpy, attrib_list, configs, config_size, num_config);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)\r
+{\r
+    static auto eglGetConfigAttrib = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value))getProcAddress(libEGL, "eglGetConfigAttrib");\r
+       return eglGetConfigAttrib(dpy, config, attribute, value);\r
+}\r
+\r
+EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)\r
+{\r
+    static auto eglCreateWindowSurface = (EGLSurface (EGLAPIENTRY*)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list))getProcAddress(libEGL, "eglCreateWindowSurface");\r
+       return eglCreateWindowSurface(dpy, config, window, attrib_list);\r
+}\r
+\r
+EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)\r
+{\r
+    static auto eglCreatePbufferSurface = (EGLSurface (EGLAPIENTRY*)(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list))getProcAddress(libEGL, "eglCreatePbufferSurface");\r
+       return eglCreatePbufferSurface(dpy, config, attrib_list);\r
+}\r
+\r
+EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)\r
+{\r
+    static auto eglCreatePixmapSurface = (EGLSurface (EGLAPIENTRY*)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list))getProcAddress(libEGL, "eglCreatePixmapSurface");\r
+       return eglCreatePixmapSurface(dpy, config, pixmap, attrib_list);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)\r
+{\r
+    static auto eglDestroySurface = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface))getProcAddress(libEGL, "eglDestroySurface");\r
+       return eglDestroySurface(dpy, surface);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)\r
+{\r
+    static auto eglQuerySurface = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value))getProcAddress(libEGL, "eglQuerySurface");\r
+       return eglQuerySurface(dpy, surface, attribute, value);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)\r
+{\r
+    static auto eglBindAPI = (EGLBoolean (EGLAPIENTRY*)(EGLenum api))getProcAddress(libEGL, "eglBindAPI");\r
+       return eglBindAPI(api);\r
+}\r
+\r
+EGLenum EGLAPIENTRY eglQueryAPI(void)\r
+{\r
+    static auto eglQueryAPI = (EGLenum (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglQueryAPI");\r
+       return eglQueryAPI();\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglWaitClient(void)\r
+{\r
+       static auto eglWaitClient = (EGLBoolean (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglWaitClient");\r
+       return eglWaitClient();\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglReleaseThread(void)\r
+{\r
+    static auto eglReleaseThread = (EGLBoolean (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglReleaseThread");\r
+       return eglReleaseThread();\r
+}\r
+\r
+EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)\r
+{\r
+    static auto eglCreatePbufferFromClientBuffer = (EGLSurface (EGLAPIENTRY*)(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list))getProcAddress(libEGL, "eglCreatePbufferFromClientBuffer");\r
+       return eglCreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)\r
+{\r
+    static auto eglSurfaceAttrib = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value))getProcAddress(libEGL, "eglSurfaceAttrib");\r
+       return eglSurfaceAttrib(dpy, surface, attribute, value);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)\r
+{\r
+    static auto eglBindTexImage = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface, EGLint buffer))getProcAddress(libEGL, "eglBindTexImage");\r
+       return eglBindTexImage(dpy, surface, buffer);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)\r
+{\r
+    static auto eglReleaseTexImage = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface, EGLint buffer))getProcAddress(libEGL, "eglReleaseTexImage");\r
+       return eglReleaseTexImage(dpy, surface, buffer);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)\r
+{\r
+    static auto eglSwapInterval = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLint interval))getProcAddress(libEGL, "eglSwapInterval");\r
+       return eglSwapInterval(dpy, interval);\r
+}\r
+\r
+EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)\r
+{\r
+    static auto eglCreateContext = (EGLContext (EGLAPIENTRY*)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list))getProcAddress(libEGL, "eglCreateContext");\r
+       return eglCreateContext(dpy, config, share_context, attrib_list);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)\r
+{\r
+    static auto eglDestroyContext = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLContext ctx))getProcAddress(libEGL, "eglDestroyContext");\r
+       return eglDestroyContext(dpy, ctx);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)\r
+{\r
+    static auto eglMakeCurrent = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx))getProcAddress(libEGL, "eglMakeCurrent");\r
+       return eglMakeCurrent(dpy, draw, read, ctx);\r
+}\r
+\r
+EGLContext EGLAPIENTRY eglGetCurrentContext(void)\r
+{\r
+    static auto eglGetCurrentContext = (EGLContext (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglGetCurrentContext");\r
+       return eglGetCurrentContext();\r
+}\r
+\r
+EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)\r
+{\r
+    static auto eglGetCurrentSurface = (EGLSurface (EGLAPIENTRY*)(EGLint readdraw))getProcAddress(libEGL, "eglGetCurrentSurface");\r
+       return eglGetCurrentSurface(readdraw);\r
+}\r
+\r
+EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)\r
+{\r
+    static auto eglGetCurrentDisplay = (EGLDisplay (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglGetCurrentDisplay");\r
+       return eglGetCurrentDisplay();\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)\r
+{\r
+    static auto eglQueryContext = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value))getProcAddress(libEGL, "eglQueryContext");\r
+       return eglQueryContext(dpy, ctx, attribute, value);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglWaitGL(void)\r
+{\r
+    static auto eglWaitGL = (EGLBoolean (EGLAPIENTRY*)(void))getProcAddress(libEGL, "eglWaitGL");\r
+       return eglWaitGL();\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)\r
+{\r
+    static auto eglWaitNative = (EGLBoolean (EGLAPIENTRY*)(EGLint engine))getProcAddress(libEGL, "eglWaitNative");\r
+       return eglWaitNative(engine);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)\r
+{\r
+    static auto eglSwapBuffers = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface))getProcAddress(libEGL, "eglSwapBuffers");\r
+       return eglSwapBuffers(dpy, surface);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)\r
+{\r
+    static auto eglCopyBuffers = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target))getProcAddress(libEGL, "eglCopyBuffers");\r
+       return eglCopyBuffers(dpy, surface, target);\r
+}\r
+\r
+EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)\r
+{\r
+    static auto eglCreateImageKHR = (EGLImageKHR (EGLAPIENTRY*)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list))getProcAddress(libEGL, "eglCreateImageKHR");\r
+       return eglCreateImageKHR(dpy, ctx, target, buffer, attrib_list);\r
+}\r
+\r
+EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)\r
+{\r
+    static auto eglDestroyImageKHR = (EGLBoolean (EGLAPIENTRY*)(EGLDisplay dpy, EGLImageKHR image))getProcAddress(libEGL, "eglDestroyImageKHR");\r
+       return eglDestroyImageKHR(dpy, image);\r
+}\r
+\r
+__eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)\r
+{\r
+    static auto eglGetProcAddress = (__eglMustCastToProperFunctionPointerType (EGLAPIENTRY*)(const char*))getProcAddress(libEGL, "eglGetProcAddress");\r
+       return eglGetProcAddress(procname);\r
+}\r
+\r
 void GL_APIENTRY glActiveTexture(GLenum texture)\r
 {\r
     TRACE("(GLenum texture = 0x%X)", texture);\r
@@ -2859,6 +3080,11 @@ void GL_APIENTRY glPointSize(GLfloat size)
        UNIMPLEMENTED();\r
 }\r
 \r
+void GL_APIENTRY glPointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *pointer)\r
+{\r
+       UNIMPLEMENTED();\r
+}\r
+\r
 void GL_APIENTRY glPointSizex(GLfixed size)\r
 {\r
        UNIMPLEMENTED();\r
@@ -3683,7 +3909,8 @@ __eglMustCastToProperFunctionPointerType glGetProcAddress(const char *procname)
                {"glGetFramebufferAttachmentParameterivOES", (__eglMustCastToProperFunctionPointerType)glGetFramebufferAttachmentParameterivOES},\r
                {"glGenerateMipmapOES", (__eglMustCastToProperFunctionPointerType)glGenerateMipmapOES},\r
                {"glBlendEquationSeparateOES", (__eglMustCastToProperFunctionPointerType)glBlendEquationSeparateOES},\r
-               {"glBlendFuncSeparateOES", (__eglMustCastToProperFunctionPointerType)glBlendFuncSeparateOES}\r
+               {"glBlendFuncSeparateOES", (__eglMustCastToProperFunctionPointerType)glBlendFuncSeparateOES},\r
+               {"glPointSizePointerOES", (__eglMustCastToProperFunctionPointerType)glPointSizePointerOES}\r
     };\r
 \r
     for(int ext = 0; ext < sizeof(glExtensions) / sizeof(Extension); ext++)\r

diff --git a/src/GLES2/libGLES_CM/libGLES_CM.def b/src/GLES2/libGLES_CM/libGLES_CM.def
index ea03026..253c1c5 100644 (file)
--- a/src/GLES2/libGLES_CM/libGLES_CM.def
+++ b/src/GLES2/libGLES_CM/libGLES_CM.def
@@ -1,156 +1,186 @@
 LIBRARY libGLES_CM
 EXPORTS
-    glActiveTexture
-    glAlphaFunc
-    glAlphaFuncx
-    glBindBuffer
-    glBindTexture
-    glBlendFunc
-    glBufferData
-    glBufferSubData
-    glClear
-    glClearColor
-    glClearColorx
-    glClearDepthf
-    glClearDepthx
-    glClearStencil
-    glClientActiveTexture
-    glClipPlanef
-    glClipPlanex
-    glColor4f
-    glColor4ub
-    glColor4x
-    glColorMask
-    glColorPointer
-    glCompressedTexImage2D
-    glCompressedTexSubImage2D
-    glCopyTexImage2D
-    glCopyTexSubImage2D
-    glCullFace
-    glDeleteBuffers
-    glDeleteTextures
-    glDepthFunc
-    glDepthMask
-    glDepthRangef
-    glDepthRangex
-    glDisable
-    glDisableClientState
-    glDrawArrays
-    glDrawElements
-    glEnable
-    glEnableClientState
-    glFinish
-    glFlush
-    glFogf
-    glFogfv
-    glFogx
-    glFogxv
-    glFrontFace
-    glFrustumf
-    glFrustumx
-    glGenBuffers
-    glGenTextures
-    glGetBooleanv
-    glGetBufferParameteriv
-    glGetClipPlanef
-    glGetClipPlanex
-    glGetError
-    glGetFixedv
-    glGetFloatv
-    glGetIntegerv
-    glGetLightfv
-    glGetLightxv
-    glGetMaterialfv
-    glGetMaterialxv
-    glGetPointerv
-    glGetString
-    glGetTexEnvfv
-    glGetTexEnviv
-    glGetTexEnvxv
-    glGetTexParameterfv
-    glGetTexParameteriv
-    glGetTexParameterxv
-    glHint
-    glIsBuffer
-    glIsEnabled
-    glIsTexture
-    glLightModelf
-    glLightModelfv
-    glLightModelx
-    glLightModelxv
-    glLightf
-    glLightfv
-    glLightx
-    glLightxv
-    glLineWidth
-    glLineWidthx
-    glLoadIdentity
-    glLoadMatrixf
-    glLoadMatrixx
-    glLogicOp
-    glMaterialf
-    glMaterialfv
-    glMaterialx
-    glMaterialxv
-    glMatrixMode
-    glMultMatrixf
-    glMultMatrixx
-    glMultiTexCoord4f
-    glMultiTexCoord4x
-    glNormal3f
-    glNormal3x
-    glNormalPointer
-    glOrthof
-    glOrthox
-    glPixelStorei
-    glPointParameterf
-    glPointParameterfv
-    glPointParameterx
-    glPointParameterxv
-    glPointSize
-    glPointSizex
-    glPolygonOffset
-    glPolygonOffsetx
-    glPopMatrix
-    glPushMatrix
-    glReadPixels
-    glRotatef
-    glRotatex
-    glSampleCoverage
-    glSampleCoveragex
-    glScalef
-    glScalex
-    glScissor
-    glShadeModel
-    glStencilFunc
-    glStencilMask
-    glStencilOp
-    glTexCoordPointer
-    glTexEnvf
-    glTexEnvfv
-    glTexEnvi
-    glTexEnviv
-    glTexEnvx
-    glTexEnvxv
-    glTexImage2D
-    glTexParameterf
-    glTexParameterfv
-    glTexParameteri
-    glTexParameteriv
-    glTexParameterx
-    glTexParameterxv
-    glTexSubImage2D
-    glTranslatef
-    glTranslatex
-    glVertexPointer
-    glViewport
+       eglBindTexImage    @134
+    eglChooseConfig    @1
+    eglCopyBuffers    @2
+    eglCreateContext    @3
+    eglCreatePbufferSurface    @4
+    eglCreatePixmapSurface    @5
+    eglCreateWindowSurface    @6
+    eglDestroyContext    @7
+    eglDestroySurface    @8
+    eglGetConfigAttrib    @9
+    eglGetConfigs    @10
+    eglGetCurrentContext    @11
+    eglGetCurrentDisplay    @12
+    eglGetCurrentSurface    @13
+    eglGetDisplay    @14
+    eglGetError    @15
+    eglGetProcAddress    @16
+    eglInitialize    @17
+    eglMakeCurrent    @18
+    eglQueryContext    @19
+    eglQueryString    @20
+    eglQuerySurface    @21
+    eglReleaseTexImage    @135
+    eglSurfaceAttrib    @133
+    eglSwapBuffers    @22
+    eglSwapInterval    @132
+    eglTerminate    @23
+    eglWaitGL    @24
+    eglWaitNative    @25
+    glActiveTexture    @26
+    glAlphaFunc    @27
+    glAlphaFuncx    @28
+    glBindBuffer    @136
+    glBindTexture    @29
+    glBlendFunc    @30
+    glBufferData    @137
+    glBufferSubData    @138
+    glClear    @31
+    glClearColor    @32
+    glClearColorx    @33
+    glClearDepthf    @34
+    glClearDepthx    @35
+    glClearStencil    @36
+    glClientActiveTexture    @37
+    glClipPlanef    @139
+    glClipPlanex    @140
+    glColor4f    @38
+    glColor4ub    @141
+    glColor4x    @39
+    glColorMask    @40
+    glColorPointer    @41
+    glCompressedTexImage2D    @42
+    glCompressedTexSubImage2D    @43
+    glCopyTexImage2D    @44
+    glCopyTexSubImage2D    @45
+    glCullFace    @46
+    glDeleteBuffers    @142
+    glDeleteTextures    @47
+    glDepthFunc    @48
+    glDepthMask    @49
+    glDepthRangef    @50
+    glDepthRangex    @51
+    glDisable    @52
+    glDisableClientState    @53
+    glDrawArrays    @54
+    glDrawElements    @55
+    glEnable    @56
+    glEnableClientState    @57
+    glFinish    @58
+    glFlush    @59
+    glFogf    @60
+    glFogfv    @61
+    glFogx    @62
+    glFogxv    @63
+    glFrontFace    @64
+    glFrustumf    @65
+    glFrustumx    @66
+    glGenBuffers    @147
+    glGenTextures    @67
+    glGetBooleanv    @143
+    glGetBufferParameteriv    @144
+    glGetClipPlanef    @145
+    glGetClipPlanex    @146
+    glGetError    @68
+    glGetFixedv    @148
+    glGetFloatv    @149
+    glGetIntegerv    @69
+    glGetLightfv    @150
+    glGetLightxv    @151
+    glGetMaterialfv    @152
+    glGetMaterialxv    @153
+    glGetPointerv    @154
+    glGetString    @70
+    glGetTexEnvfv    @156
+    glGetTexEnviv    @155
+    glGetTexEnvxv    @157
+    glGetTexParameterfv    @159
+    glGetTexParameteriv    @158
+    glGetTexParameterxv    @160
+    glHint    @71
+    glIsBuffer    @161
+    glIsEnabled    @162
+    glIsTexture    @163
+    glLightModelf    @72
+    glLightModelfv    @73
+    glLightModelx    @74
+    glLightModelxv    @75
+    glLightf    @76
+    glLightfv    @77
+    glLightx    @78
+    glLightxv    @79
+    glLineWidth    @80
+    glLineWidthx    @81
+    glLoadIdentity    @82
+    glLoadMatrixf    @83
+    glLoadMatrixx    @84
+    glLogicOp    @85
+    glMaterialf    @86
+    glMaterialfv    @87
+    glMaterialx    @88
+    glMaterialxv    @89
+    glMatrixMode    @90
+    glMultMatrixf    @91
+    glMultMatrixx    @92
+    glMultiTexCoord4f    @93
+    glMultiTexCoord4x    @94
+    glNormal3f    @95
+    glNormal3x    @96
+    glNormalPointer    @97
+    glOrthof    @98
+    glOrthox    @99
+    glPixelStorei    @100
+    glPointParameterf    @164
+    glPointParameterfv    @165
+    glPointParameterx    @166
+    glPointParameterxv    @167
+    glPointSize    @101
+    glPointSizePointerOES    @168
+    glPointSizex    @102
+    glPolygonOffset    @103
+    glPolygonOffsetx    @104
+    glPopMatrix    @105
+    glPushMatrix    @106
+    glReadPixels    @107
+    glRotatef    @108
+    glRotatex    @109
+    glSampleCoverage    @110
+    glSampleCoveragex    @111
+    glScalef    @112
+    glScalex    @113
+    glScissor    @114
+    glShadeModel    @115
+    glStencilFunc    @116
+    glStencilMask    @117
+    glStencilOp    @118
+    glTexCoordPointer    @119
+    glTexEnvf    @120
+    glTexEnvfv    @121
+    glTexEnvi    @169
+    glTexEnviv    @174
+    glTexEnvx    @122
+    glTexEnvxv    @123
+    glTexImage2D    @124
+    glTexParameterf    @125
+    glTexParameterfv    @171
+    glTexParameteri    @170
+    glTexParameteriv    @172
+    glTexParameterx    @126
+    glTexParameterxv    @173
+    glTexSubImage2D    @127
+    glTranslatef    @128
+    glTranslatex    @129
+    glVertexPointer    @130
+    glViewport    @131
 
     ; EGL dependencies
-    glCreateContext                 @144
-    glGetProcAddress                @148
+    glCreateContext
+    glGetProcAddress
 
-       createFrameBuffer               @172
-       createBackBuffer                @173
-       createDepthStencil              @175
+       createFrameBuffer
+       createBackBuffer
+       createDepthStencil
 
        Register
\ No newline at end of file

diff --git a/src/GLES2/libGLES_CM/libGLES_CM.vcxproj b/src/GLES2/libGLES_CM/libGLES_CM.vcxproj
index 549e620..b3a4689 100644 (file)
--- a/src/GLES2/libGLES_CM/libGLES_CM.vcxproj
+++ b/src/GLES2/libGLES_CM/libGLES_CM.vcxproj
@@ -179,9 +179,10 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Co
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\common\debug.h" />\r
-    <ClInclude Include="..\include\GLES2\gl2.h" />\r
-    <ClInclude Include="..\include\GLES2\gl2ext.h" />\r
-    <ClInclude Include="..\include\GLES2\gl2platform.h" />\r
+    <ClInclude Include="..\include\GLES\egl.h" />\r
+    <ClInclude Include="..\include\GLES\gl.h" />\r
+    <ClInclude Include="..\include\GLES\glext.h" />\r
+    <ClInclude Include="..\include\GLES\glplatform.h" />\r
     <ClInclude Include="Buffer.h" />\r
     <ClInclude Include="Context.h" />\r
     <ClInclude Include="Device.hpp" />\r

diff --git a/src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters b/src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
index ba143d2..b90d7b9 100644 (file)
--- a/src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
+++ b/src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
@@ -109,16 +109,19 @@
     <ClInclude Include="Image.hpp">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\include\GLES2\gl2.h">\r
+    <ClInclude Include="..\common\debug.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\include\GLES2\gl2ext.h">\r
+    <ClInclude Include="..\include\GLES\egl.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\include\GLES2\gl2platform.h">\r
+    <ClInclude Include="..\include\GLES\gl.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\common\debug.h">\r
+    <ClInclude Include="..\include\GLES\glext.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\include\GLES\glplatform.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r

diff --git a/src/GLES2/libGLESv2/libGLESv2.cpp b/src/GLES2/libGLESv2/libGLESv2.cpp
index d6a4904..bef619c 100644 (file)
--- a/src/GLES2/libGLESv2/libGLESv2.cpp
+++ b/src/GLES2/libGLESv2/libGLESv2.cpp
@@ -6100,7 +6100,7 @@ void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image
 {\r
        if(egl::getClientVersion() == 1)\r
        {\r
-               static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)es1::getProcAddress("glEGLImageTargetTexture2DOES");\r
+               static auto glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)es1::getProcAddress("glEGLImageTargetTexture2DOES");\r
                return glEGLImageTargetTexture2DOES(target, image);\r
        }\r
 \r

diff --git a/src/GLES2/libGLESv2/libGLESv2.def b/src/GLES2/libGLESv2/libGLESv2.def
index c3b133e..07f295d 100644 (file)
--- a/src/GLES2/libGLESv2/libGLESv2.def
+++ b/src/GLES2/libGLESv2/libGLESv2.def
@@ -169,11 +169,11 @@ EXPORTS
     glGetQueryObjectuivEXT          @171
 
     ; EGL dependencies
-    glCreateContext                 @144
-    glGetProcAddress                @148
+    glCreateContext
+    glGetProcAddress
 
-       createFrameBuffer               @172
-       createBackBuffer                @173
-       createDepthStencil              @175
+       createFrameBuffer
+       createBackBuffer
+       createDepthStencil
 
        Register
\ No newline at end of file

diff --git a/src/SwiftShader.sln b/src/SwiftShader.sln
index 9984441..105f22e 100644 (file)
--- a/src/SwiftShader.sln
+++ b/src/SwiftShader.sln
@@ -18,12 +18,12 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "GLES2\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}\r
+               {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "GLES2\libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}\r
-               {B5871A7A-968C-42E3-A33B-981E6F448E78} = {B5871A7A-968C-42E3-A33B-981E6F448E78}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMAnalysis", "LLVM\lib\Analysis\LLVMAnalysis.vcxproj", "{97EDF19C-6360-4770-9255-EBA2F1A13E9B}"\r
@@ -226,6 +226,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLES2DisplacementMap", "..
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "GLES2\libGLES_CM\libGLES_CM.vcxproj", "{235B1D85-E6B6-45E2-BA5D-5C60396428FF}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLESBasicTnL", "..\tests\third_party\PowerVR\Examples\Beginner\04_BasicTnL\OGLES\Build\WindowsVC2010\OGLESBasicTnL.vcxproj", "{AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}"\r
        ProjectSection(ProjectDependencies) = postProject\r