From 4adfc6ed31983bcf52e106469f22bb121a56532b Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 12 May 2015 16:56:37 -0700 Subject: [PATCH] glapi: Remove static dispatch for functions that didn't exist in fglrx Comparing the output of nm -D arch/x86_64/usr/X11R6/lib64/fglrx/fglrx-libGL.so.1.2 |\ grep ' T gl[^X]' | sed 's/.* T //' between Catalyst 14.6 Beta and this commit, the only change is a bunch of functions that AMD exports that Mesa does not and some OpenGL ES 1.1 functions that Mesa exported but AMD does not. The OpenGL ES 1.1 functions (e.g., glAlphaFuncx) are added by extensions in desktop. Our infrastructure doesn't allow us to statically export a function in one lib and not in another. The GLES1 conformance tests expect to be able to link with these functions, so we have to export them. If a function is not statically exported by either of the major binary drivers on Linux, there is almost zero chance that any application statically links with it. As a side note... I find it odd that AMD exports glTextureBarrierNV but not glTextureBarrier. Signed-off-by: Ian Romanick Reviewed-by: Emil Velikov --- src/mapi/glapi/gen/static_data.py | 121 ------------------------------ 1 file changed, 121 deletions(-) diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py index ab9c605fe9e..8489d0ecbda 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mapi/glapi/gen/static_data.py @@ -437,7 +437,6 @@ offsets = { functions = [ "Accum", - "ActiveProgramEXT", "ActiveTexture", "ActiveTextureARB", "AlphaFragmentOp1ATI", @@ -445,7 +444,6 @@ functions = [ "AlphaFragmentOp3ATI", "AlphaFunc", "AlphaFuncx", - "AreProgramsResidentNV", "AreTexturesResident", "AreTexturesResidentEXT", "ArrayElement", @@ -482,7 +480,6 @@ functions = [ "BindImageTexture", "BindImageTextures", "BindProgramARB", - "BindProgramNV", "BindRenderbuffer", "BindRenderbufferEXT", "BindSampler", @@ -596,7 +593,6 @@ functions = [ "ColorPointerEXT", "ColorSubTable", "ColorTable", - "ColorTableEXT", "ColorTableParameterfv", "ColorTableParameteriv", "CompileShader", @@ -640,7 +636,6 @@ functions = [ "CreateProgramObjectARB", "CreateShader", "CreateShaderObjectARB", - "CreateShaderProgramEXT", "CullFace", "DebugMessageCallback", "DebugMessageCallbackARB", @@ -658,7 +653,6 @@ functions = [ "DeletePerfMonitorsAMD", "DeleteProgram", "DeleteProgramsARB", - "DeleteProgramsNV", "DeleteQueries", "DeleteQueriesARB", "DeleteRenderbuffers", @@ -719,8 +713,6 @@ functions = [ "EdgeFlagPointer", "EdgeFlagPointerEXT", "EdgeFlagv", - "EGLImageTargetRenderbufferStorageOES", - "EGLImageTargetTexture2DOES", "Enable", "EnableClientState", "Enablei", @@ -750,7 +742,6 @@ functions = [ "EvalMesh2", "EvalPoint1", "EvalPoint2", - "ExecuteProgramNV", "FeedbackBuffer", "FenceSync", "Finish", @@ -799,7 +790,6 @@ functions = [ "GenLists", "GenPerfMonitorsAMD", "GenProgramsARB", - "GenProgramsNV", "GenQueries", "GenQueriesARB", "GenRenderbuffers", @@ -836,11 +826,8 @@ functions = [ "GetClipPlanef", "GetClipPlanex", "GetColorTable", - "GetColorTableEXT", "GetColorTableParameterfv", - "GetColorTableParameterfvEXT", "GetColorTableParameteriv", - "GetColorTableParameterivEXT", "GetCompressedTexImage", "GetCompressedTexImageARB", "GetConvolutionFilter", @@ -903,7 +890,6 @@ functions = [ "GetnUniformuivARB", "GetObjectLabel", "GetObjectParameterfvARB", - "GetObjectParameterivAPPLE", "GetObjectParameterivARB", "GetObjectPtrLabel", "GetPerfMonitorCounterDataAMD", @@ -924,15 +910,9 @@ functions = [ "GetProgramInfoLog", "GetProgramiv", "GetProgramivARB", - "GetProgramivNV", "GetProgramLocalParameterdvARB", "GetProgramLocalParameterfvARB", - "GetProgramNamedParameterdvNV", - "GetProgramNamedParameterfvNV", - "GetProgramParameterdvNV", - "GetProgramParameterfvNV", "GetProgramStringARB", - "GetProgramStringNV", "GetQueryIndexediv", "GetQueryiv", "GetQueryivARB", @@ -973,7 +953,6 @@ functions = [ "GetTexParameterIuivEXT", "GetTexParameteriv", "GetTexParameterxv", - "GetTrackMatrixivNV", "GetTransformFeedbackVarying", "GetTransformFeedbackVaryingEXT", "GetUniformBlockIndex", @@ -988,20 +967,16 @@ functions = [ "GetUniformuivEXT", "GetVertexAttribdv", "GetVertexAttribdvARB", - "GetVertexAttribdvNV", "GetVertexAttribfv", "GetVertexAttribfvARB", - "GetVertexAttribfvNV", "GetVertexAttribIiv", "GetVertexAttribIivEXT", "GetVertexAttribIuiv", "GetVertexAttribIuivEXT", "GetVertexAttribiv", "GetVertexAttribivARB", - "GetVertexAttribivNV", "GetVertexAttribPointerv", "GetVertexAttribPointervARB", - "GetVertexAttribPointervNV", "Hint", "Histogram", "Indexd", @@ -1035,7 +1010,6 @@ functions = [ "IsList", "IsProgram", "IsProgramARB", - "IsProgramNV", "IsQuery", "IsQueryARB", "IsRenderbuffer", @@ -1070,7 +1044,6 @@ functions = [ "LoadMatrixf", "LoadMatrixx", "LoadName", - "LoadProgramNV", "LoadTransposeMatrixd", "LoadTransposeMatrixdARB", "LoadTransposeMatrixf", @@ -1204,8 +1177,6 @@ functions = [ "NormalPointerEXT", "ObjectLabel", "ObjectPtrLabel", - "ObjectPurgeableAPPLE", - "ObjectUnpurgeableAPPLE", "Ortho", "Orthof", "Orthox", @@ -1227,9 +1198,7 @@ functions = [ "PointParameterfvARB", "PointParameterfvEXT", "PointParameteri", - "PointParameteriNV", "PointParameteriv", - "PointParameterivNV", "PointParameterx", "PointParameterxv", "PointSize", @@ -1237,7 +1206,6 @@ functions = [ "PointSizex", "PolygonMode", "PolygonOffset", - "PolygonOffsetEXT", "PolygonOffsetx", "PolygonStipple", "PopAttrib", @@ -1259,18 +1227,8 @@ functions = [ "ProgramLocalParameter4dvARB", "ProgramLocalParameter4fARB", "ProgramLocalParameter4fvARB", - "ProgramNamedParameter4dNV", - "ProgramNamedParameter4dvNV", - "ProgramNamedParameter4fNV", - "ProgramNamedParameter4fvNV", - "ProgramParameter4dNV", - "ProgramParameter4dvNV", - "ProgramParameter4fNV", - "ProgramParameter4fvNV", "ProgramParameteri", "ProgramParameteriARB", - "ProgramParameters4dvNV", - "ProgramParameters4fvNV", "ProgramStringARB", "ProvokingVertex", "ProvokingVertexEXT", @@ -1320,10 +1278,8 @@ functions = [ "RenderbufferStorageMultisample", "RenderbufferStorageMultisampleEXT", "RenderMode", - "RequestResidentProgramsNV", "ResetHistogram", "ResetMinmax", - "ResizeBuffersMESA", "ResumeTransformFeedback", "Rotated", "Rotatef", @@ -1482,13 +1438,11 @@ functions = [ "TexSubImage2DEXT", "TexSubImage3D", "TexSubImage3DEXT", - "TextureBarrier", "TextureBarrierNV", "TextureStorage1DEXT", "TextureStorage2DEXT", "TextureStorage3DEXT", "TextureView", - "TrackMatrixNV", "TransformFeedbackVaryings", "TransformFeedbackVaryingsEXT", "Translated", @@ -1560,19 +1514,8 @@ functions = [ "UnmapBufferARB", "UseProgram", "UseProgramObjectARB", - "UseShaderProgramEXT", "ValidateProgram", "ValidateProgramARB", - "VDPAUFiniNV", - "VDPAUGetSurfaceivNV", - "VDPAUInitNV", - "VDPAUIsSurfaceNV", - "VDPAUMapSurfacesNV", - "VDPAURegisterOutputSurfaceNV", - "VDPAURegisterVideoSurfaceNV", - "VDPAUSurfaceAccessNV", - "VDPAUUnmapSurfacesNV", - "VDPAUUnregisterSurfaceNV", "Vertex2d", "Vertex2dv", "Vertex2f", @@ -1599,72 +1542,50 @@ functions = [ "Vertex4sv", "VertexAttrib1d", "VertexAttrib1dARB", - "VertexAttrib1dNV", "VertexAttrib1dv", "VertexAttrib1dvARB", - "VertexAttrib1dvNV", "VertexAttrib1f", "VertexAttrib1fARB", - "VertexAttrib1fNV", "VertexAttrib1fv", "VertexAttrib1fvARB", - "VertexAttrib1fvNV", "VertexAttrib1s", "VertexAttrib1sARB", - "VertexAttrib1sNV", "VertexAttrib1sv", "VertexAttrib1svARB", - "VertexAttrib1svNV", "VertexAttrib2d", "VertexAttrib2dARB", - "VertexAttrib2dNV", "VertexAttrib2dv", "VertexAttrib2dvARB", - "VertexAttrib2dvNV", "VertexAttrib2f", "VertexAttrib2fARB", - "VertexAttrib2fNV", "VertexAttrib2fv", "VertexAttrib2fvARB", - "VertexAttrib2fvNV", "VertexAttrib2s", "VertexAttrib2sARB", - "VertexAttrib2sNV", "VertexAttrib2sv", "VertexAttrib2svARB", - "VertexAttrib2svNV", "VertexAttrib3d", "VertexAttrib3dARB", - "VertexAttrib3dNV", "VertexAttrib3dv", "VertexAttrib3dvARB", - "VertexAttrib3dvNV", "VertexAttrib3f", "VertexAttrib3fARB", - "VertexAttrib3fNV", "VertexAttrib3fv", "VertexAttrib3fvARB", - "VertexAttrib3fvNV", "VertexAttrib3s", "VertexAttrib3sARB", - "VertexAttrib3sNV", "VertexAttrib3sv", "VertexAttrib3svARB", - "VertexAttrib3svNV", "VertexAttrib4bv", "VertexAttrib4bvARB", "VertexAttrib4d", "VertexAttrib4dARB", - "VertexAttrib4dNV", "VertexAttrib4dv", "VertexAttrib4dvARB", - "VertexAttrib4dvNV", "VertexAttrib4f", "VertexAttrib4fARB", - "VertexAttrib4fNV", "VertexAttrib4fv", "VertexAttrib4fvARB", - "VertexAttrib4fvNV", "VertexAttrib4iv", "VertexAttrib4ivARB", "VertexAttrib4Nbv", @@ -1683,14 +1604,10 @@ functions = [ "VertexAttrib4NusvARB", "VertexAttrib4s", "VertexAttrib4sARB", - "VertexAttrib4sNV", "VertexAttrib4sv", "VertexAttrib4svARB", - "VertexAttrib4svNV", - "VertexAttrib4ubNV", "VertexAttrib4ubv", "VertexAttrib4ubvARB", - "VertexAttrib4ubvNV", "VertexAttrib4uiv", "VertexAttrib4uivARB", "VertexAttrib4usv", @@ -1753,20 +1670,6 @@ functions = [ "VertexAttribP4uiv", "VertexAttribPointer", "VertexAttribPointerARB", - "VertexAttribPointerNV", - "VertexAttribs1dvNV", - "VertexAttribs1fvNV", - "VertexAttribs1svNV", - "VertexAttribs2dvNV", - "VertexAttribs2fvNV", - "VertexAttribs2svNV", - "VertexAttribs3dvNV", - "VertexAttribs3fvNV", - "VertexAttribs3svNV", - "VertexAttribs4dvNV", - "VertexAttribs4fvNV", - "VertexAttribs4svNV", - "VertexAttribs4ubvNV", "VertexBindingDivisor", "VertexP2ui", "VertexP2uiv", @@ -1783,58 +1686,34 @@ functions = [ "WaitSync", "WindowPos2d", "WindowPos2dARB", - "WindowPos2dMESA", "WindowPos2dv", "WindowPos2dvARB", - "WindowPos2dvMESA", "WindowPos2f", "WindowPos2fARB", - "WindowPos2fMESA", "WindowPos2fv", "WindowPos2fvARB", - "WindowPos2fvMESA", "WindowPos2i", "WindowPos2iARB", - "WindowPos2iMESA", "WindowPos2iv", "WindowPos2ivARB", - "WindowPos2ivMESA", "WindowPos2s", "WindowPos2sARB", - "WindowPos2sMESA", "WindowPos2sv", "WindowPos2svARB", - "WindowPos2svMESA", "WindowPos3d", "WindowPos3dARB", - "WindowPos3dMESA", "WindowPos3dv", "WindowPos3dvARB", - "WindowPos3dvMESA", "WindowPos3f", "WindowPos3fARB", - "WindowPos3fMESA", "WindowPos3fv", "WindowPos3fvARB", - "WindowPos3fvMESA", "WindowPos3i", "WindowPos3iARB", - "WindowPos3iMESA", "WindowPos3iv", "WindowPos3ivARB", - "WindowPos3ivMESA", "WindowPos3s", "WindowPos3sARB", - "WindowPos3sMESA", "WindowPos3sv", "WindowPos3svARB", - "WindowPos3svMESA", - "WindowPos4dMESA", - "WindowPos4dvMESA", - "WindowPos4fMESA", - "WindowPos4fvMESA", - "WindowPos4iMESA", - "WindowPos4ivMESA", - "WindowPos4sMESA", - "WindowPos4svMESA", ] -- 2.30.2