Skip to content

S
swiftshader
Commit f3d2efd8 by Nicolas Capens Committed by Nicolas Capens
Options

Match the exports ordinals to PowerVR.

BUG=18110152 Change-Id: I6152faa4c5717fdb34e10b9d8f5b531683886910 Reviewed-on: https://swiftshader-review.googlesource.com/1280Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 6b8dc3e2
Showing with 202 additions and 163 deletions
src/GLES2/libGLES_CM/libGLES_CM.def
LIBRARY libGLES_CM LIBRARY libGLES_CM
EXPORTS EXPORTS
glActiveTexture eglBindTexImage @134
glAlphaFunc eglChooseConfig @1
glAlphaFuncx eglCopyBuffers @2
glBindBuffer eglCreateContext @3
glBindTexture eglCreatePbufferSurface @4
glBlendFunc eglCreatePixmapSurface @5
glBufferData eglCreateWindowSurface @6
glBufferSubData eglDestroyContext @7
glClear eglDestroySurface @8
glClearColor eglGetConfigAttrib @9
glClearColorx eglGetConfigs @10
glClearDepthf eglGetCurrentContext @11
glClearDepthx eglGetCurrentDisplay @12
glClearStencil eglGetCurrentSurface @13
glClientActiveTexture eglGetDisplay @14
glClipPlanef eglGetError @15
glClipPlanex eglGetProcAddress @16
glColor4f eglInitialize @17
glColor4ub eglMakeCurrent @18
glColor4x eglQueryContext @19
glColorMask eglQueryString @20
glColorPointer eglQuerySurface @21
glCompressedTexImage2D eglReleaseTexImage @135
glCompressedTexSubImage2D eglSurfaceAttrib @133
glCopyTexImage2D eglSwapBuffers @22
glCopyTexSubImage2D eglSwapInterval @132
glCullFace eglTerminate @23
glDeleteBuffers eglWaitGL @24
glDeleteTextures eglWaitNative @25
glDepthFunc glActiveTexture @26
glDepthMask glAlphaFunc @27
glDepthRangef glAlphaFuncx @28
glDepthRangex glBindBuffer @136
glDisable glBindTexture @29
glDisableClientState glBlendFunc @30
glDrawArrays glBufferData @137
glDrawElements glBufferSubData @138
glEnable glClear @31
glEnableClientState glClearColor @32
glFinish glClearColorx @33
glFlush glClearDepthf @34
glFogf glClearDepthx @35
glFogfv glClearStencil @36
glFogx glClientActiveTexture @37
glFogxv glClipPlanef @139
glFrontFace glClipPlanex @140
glFrustumf glColor4f @38
glFrustumx glColor4ub @141
glGenBuffers glColor4x @39
glGenTextures glColorMask @40
glGetBooleanv glColorPointer @41
glGetBufferParameteriv glCompressedTexImage2D @42
glGetClipPlanef glCompressedTexSubImage2D @43
glGetClipPlanex glCopyTexImage2D @44
glGetError glCopyTexSubImage2D @45
glGetFixedv glCullFace @46
glGetFloatv glDeleteBuffers @142
glGetIntegerv glDeleteTextures @47
glGetLightfv glDepthFunc @48
glGetLightxv glDepthMask @49
glGetMaterialfv glDepthRangef @50
glGetMaterialxv glDepthRangex @51
glGetPointerv glDisable @52
glGetString glDisableClientState @53
glGetTexEnvfv glDrawArrays @54
glGetTexEnviv glDrawElements @55
glGetTexEnvxv glEnable @56
glGetTexParameterfv glEnableClientState @57
glGetTexParameteriv glFinish @58
glGetTexParameterxv glFlush @59
glHint glFogf @60
glIsBuffer glFogfv @61
glIsEnabled glFogx @62
glIsTexture glFogxv @63
glLightModelf glFrontFace @64
glLightModelfv glFrustumf @65
glLightModelx glFrustumx @66
glLightModelxv glGenBuffers @147
glLightf glGenTextures @67
glLightfv glGetBooleanv @143
glLightx glGetBufferParameteriv @144
glLightxv glGetClipPlanef @145
glLineWidth glGetClipPlanex @146
glLineWidthx glGetError @68
glLoadIdentity glGetFixedv @148
glLoadMatrixf glGetFloatv @149
glLoadMatrixx glGetIntegerv @69
glLogicOp glGetLightfv @150
glMaterialf glGetLightxv @151
glMaterialfv glGetMaterialfv @152
glMaterialx glGetMaterialxv @153
glMaterialxv glGetPointerv @154
glMatrixMode glGetString @70
glMultMatrixf glGetTexEnvfv @156
glMultMatrixx glGetTexEnviv @155
glMultiTexCoord4f glGetTexEnvxv @157
glMultiTexCoord4x glGetTexParameterfv @159
glNormal3f glGetTexParameteriv @158
glNormal3x glGetTexParameterxv @160
glNormalPointer glHint @71
glOrthof glIsBuffer @161
glOrthox glIsEnabled @162
glPixelStorei glIsTexture @163
glPointParameterf glLightModelf @72
glPointParameterfv glLightModelfv @73
glPointParameterx glLightModelx @74
glPointParameterxv glLightModelxv @75
glPointSize glLightf @76
glPointSizex glLightfv @77
glPolygonOffset glLightx @78
glPolygonOffsetx glLightxv @79
glPopMatrix glLineWidth @80
glPushMatrix glLineWidthx @81
glReadPixels glLoadIdentity @82
glRotatef glLoadMatrixf @83
glRotatex glLoadMatrixx @84
glSampleCoverage glLogicOp @85
glSampleCoveragex glMaterialf @86
glScalef glMaterialfv @87
glScalex glMaterialx @88
glScissor glMaterialxv @89
glShadeModel glMatrixMode @90
glStencilFunc glMultMatrixf @91
glStencilMask glMultMatrixx @92
glStencilOp glMultiTexCoord4f @93
glTexCoordPointer glMultiTexCoord4x @94
glTexEnvf glNormal3f @95
glTexEnvfv glNormal3x @96
glTexEnvi glNormalPointer @97
glTexEnviv glOrthof @98
glTexEnvx glOrthox @99
glTexEnvxv glPixelStorei @100
glTexImage2D glPointParameterf @164
glTexParameterf glPointParameterfv @165
glTexParameterfv glPointParameterx @166
glTexParameteri glPointParameterxv @167
glTexParameteriv glPointSize @101
glTexParameterx glPointSizePointerOES @168
glTexParameterxv glPointSizex @102
glTexSubImage2D glPolygonOffset @103
glTranslatef glPolygonOffsetx @104
glTranslatex glPopMatrix @105
glVertexPointer glPushMatrix @106
glViewport 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 ; EGL dependencies
glCreateContext @144 glCreateContext
glGetProcAddress @148 glGetProcAddress
createFrameBuffer @172 createFrameBuffer
createBackBuffer @173 createBackBuffer
createDepthStencil @175 createDepthStencil
Register Register
\ No newline at end of file
src/GLES2/libGLES_CM/libGLES_CM.vcxproj
...@@ -179,9 +179,10 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Co ...@@ -179,9 +179,10 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Co
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\common\debug.h" /> <ClInclude Include="..\common\debug.h" />
<ClInclude Include="..\include\GLES2\gl2.h" /> <ClInclude Include="..\include\GLES\egl.h" />
<ClInclude Include="..\include\GLES2\gl2ext.h" /> <ClInclude Include="..\include\GLES\gl.h" />
<ClInclude Include="..\include\GLES2\gl2platform.h" /> <ClInclude Include="..\include\GLES\glext.h" />
<ClInclude Include="..\include\GLES\glplatform.h" />
<ClInclude Include="Buffer.h" /> <ClInclude Include="Buffer.h" />
<ClInclude Include="Context.h" /> <ClInclude Include="Context.h" />
<ClInclude Include="Device.hpp" /> <ClInclude Include="Device.hpp" />
......
src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
...@@ -109,16 +109,19 @@ ...@@ -109,16 +109,19 @@
<ClInclude Include="Image.hpp"> <ClInclude Include="Image.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\GLES2\gl2.h"> <ClInclude Include="..\common\debug.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\GLES2\gl2ext.h"> <ClInclude Include="..\include\GLES\egl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\GLES2\gl2platform.h"> <ClInclude Include="..\include\GLES\gl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\common\debug.h"> <ClInclude Include="..\include\GLES\glext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\GLES\glplatform.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
......
src/GLES2/libGLESv2/libGLESv2.cpp
...@@ -6100,7 +6100,7 @@ void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image ...@@ -6100,7 +6100,7 @@ void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image
{ {
if(egl::getClientVersion() == 1) if(egl::getClientVersion() == 1)
{ {
static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)es1::getProcAddress("glEGLImageTargetTexture2DOES"); static auto glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)es1::getProcAddress("glEGLImageTargetTexture2DOES");
return glEGLImageTargetTexture2DOES(target, image); return glEGLImageTargetTexture2DOES(target, image);
} }
......
src/GLES2/libGLESv2/libGLESv2.def
...@@ -169,11 +169,11 @@ EXPORTS ...@@ -169,11 +169,11 @@ EXPORTS
glGetQueryObjectuivEXT @171 glGetQueryObjectuivEXT @171
; EGL dependencies ; EGL dependencies
glCreateContext @144 glCreateContext
glGetProcAddress @148 glGetProcAddress
createFrameBuffer @172 createFrameBuffer
createBackBuffer @173 createBackBuffer
createDepthStencil @175 createDepthStencil
Register Register
\ No newline at end of file
src/SwiftShader.sln
...@@ -18,12 +18,12 @@ EndProject ...@@ -18,12 +18,12 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "GLES2\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "GLES2\libGLESv2\libGLESv2.vcxproj", "{B5871A7A-968C-42E3-A33B-981E6F448E78}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "GLES2\libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "GLES2\libEGL\libEGL.vcxproj", "{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}
{B5871A7A-968C-42E3-A33B-981E6F448E78} = {B5871A7A-968C-42E3-A33B-981E6F448E78}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMAnalysis", "LLVM\lib\Analysis\LLVMAnalysis.vcxproj", "{97EDF19C-6360-4770-9255-EBA2F1A13E9B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLVMAnalysis", "LLVM\lib\Analysis\LLVMAnalysis.vcxproj", "{97EDF19C-6360-4770-9255-EBA2F1A13E9B}"
...@@ -226,6 +226,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLES2DisplacementMap", ".. ...@@ -226,6 +226,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLES2DisplacementMap", "..
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "GLES2\libGLES_CM\libGLES_CM.vcxproj", "{235B1D85-E6B6-45E2-BA5D-5C60396428FF}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLES_CM", "GLES2\libGLES_CM\libGLES_CM.vcxproj", "{235B1D85-E6B6-45E2-BA5D-5C60396428FF}"
ProjectSection(ProjectDependencies) = postProject
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
EndProjectSection
EndProject EndProject
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}" 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}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment