From d2ee60cd5286695f738117c87c24b04b08340c6b Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 12 May 2015 17:27:26 -0700 Subject: [PATCH] glapi: Remove static dispatch for functions that didn't exist in NVIDIA Comparing the output of nm -D libGL.so.349.16 | grep ' T gl[^X]' | sed 's/.* T //' between Catalyst NVIDIA 349.16 and this commit, the only change is a bunch of functions that NVIDIA exports that Mesa does not. 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. Signed-off-by: Ian Romanick Reviewed-by: Emil Velikov --- src/mapi/glapi/gen/static_data.py | 46 --------------------------------------- 1 file changed, 46 deletions(-) diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py index 8489d0e..cf909fc 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mapi/glapi/gen/static_data.py @@ -439,9 +439,6 @@ functions = [ "Accum", "ActiveTexture", "ActiveTextureARB", - "AlphaFragmentOp1ATI", - "AlphaFragmentOp2ATI", - "AlphaFragmentOp3ATI", "AlphaFunc", "AlphaFuncx", "AreTexturesResident", @@ -453,28 +450,21 @@ functions = [ "Begin", "BeginConditionalRender", "BeginConditionalRenderNV", - "BeginFragmentShaderATI", - "BeginPerfMonitorAMD", "BeginQuery", "BeginQueryARB", "BeginQueryIndexed", "BeginTransformFeedback", - "BeginTransformFeedbackEXT", "BindAttribLocation", "BindAttribLocationARB", "BindBuffer", "BindBufferARB", "BindBufferBase", - "BindBufferBaseEXT", - "BindBufferOffsetEXT", "BindBufferRange", - "BindBufferRangeEXT", "BindBuffersBase", "BindBuffersRange", "BindFragDataLocation", "BindFragDataLocationEXT", "BindFragDataLocationIndexed", - "BindFragmentShaderATI", "BindFramebuffer", "BindFramebufferEXT", "BindImageTexture", @@ -497,17 +487,13 @@ functions = [ "BlendEquation", "BlendEquationEXT", "BlendEquationiARB", - "BlendEquationIndexedAMD", "BlendEquationSeparate", "BlendEquationSeparateiARB", - "BlendEquationSeparateIndexedAMD", "BlendFunc", "BlendFunciARB", - "BlendFuncIndexedAMD", "BlendFuncSeparate", "BlendFuncSeparateEXT", "BlendFuncSeparateiARB", - "BlendFuncSeparateIndexedAMD", "BlitFramebuffer", "BufferData", "BufferDataARB", @@ -578,9 +564,6 @@ functions = [ "Color4us", "Color4usv", "Color4x", - "ColorFragmentOp1ATI", - "ColorFragmentOp2ATI", - "ColorFragmentOp3ATI", "ColorMask", "ColorMaski", "ColorMaskIndexedEXT", @@ -623,13 +606,9 @@ functions = [ "CopyImageSubData", "CopyPixels", "CopyTexImage1D", - "CopyTexImage1DEXT", "CopyTexImage2D", - "CopyTexImage2DEXT", "CopyTexSubImage1D", - "CopyTexSubImage1DEXT", "CopyTexSubImage2D", - "CopyTexSubImage2DEXT", "CopyTexSubImage3D", "CopyTexSubImage3DEXT", "CreateProgram", @@ -645,12 +624,10 @@ functions = [ "DebugMessageInsertARB", "DeleteBuffers", "DeleteBuffersARB", - "DeleteFragmentShaderATI", "DeleteFramebuffers", "DeleteFramebuffersEXT", "DeleteLists", "DeleteObjectARB", - "DeletePerfMonitorsAMD", "DeleteProgram", "DeleteProgramsARB", "DeleteQueries", @@ -722,14 +699,11 @@ functions = [ "End", "EndConditionalRender", "EndConditionalRenderNV", - "EndFragmentShaderATI", "EndList", - "EndPerfMonitorAMD", "EndQuery", "EndQueryARB", "EndQueryIndexed", "EndTransformFeedback", - "EndTransformFeedbackEXT", "EvalCoord1d", "EvalCoord1dv", "EvalCoord1f", @@ -784,11 +758,9 @@ functions = [ "GenBuffersARB", "GenerateMipmap", "GenerateMipmapEXT", - "GenFragmentShadersATI", "GenFramebuffers", "GenFramebuffersEXT", "GenLists", - "GenPerfMonitorsAMD", "GenProgramsARB", "GenQueries", "GenQueriesARB", @@ -892,12 +864,6 @@ functions = [ "GetObjectParameterfvARB", "GetObjectParameterivARB", "GetObjectPtrLabel", - "GetPerfMonitorCounterDataAMD", - "GetPerfMonitorCounterInfoAMD", - "GetPerfMonitorCountersAMD", - "GetPerfMonitorCounterStringAMD", - "GetPerfMonitorGroupsAMD", - "GetPerfMonitorGroupStringAMD", "GetPixelMapfv", "GetPixelMapuiv", "GetPixelMapusv", @@ -935,8 +901,6 @@ functions = [ "GetString", "GetStringi", "GetSynciv", - "GetTexBumpParameterfvATI", - "GetTexBumpParameterivATI", "GetTexEnvfv", "GetTexEnviv", "GetTexEnvxv", @@ -954,7 +918,6 @@ functions = [ "GetTexParameteriv", "GetTexParameterxv", "GetTransformFeedbackVarying", - "GetTransformFeedbackVaryingEXT", "GetUniformBlockIndex", "GetUniformfv", "GetUniformfvARB", @@ -1180,7 +1143,6 @@ functions = [ "Ortho", "Orthof", "Orthox", - "PassTexCoordATI", "PassThrough", "PauseTransformFeedback", "PixelMapfv", @@ -1287,7 +1249,6 @@ functions = [ "SampleCoverage", "SampleCoverageARB", "SampleCoveragex", - "SampleMapATI", "SampleMaski", "SamplerParameterf", "SamplerParameterfv", @@ -1339,9 +1300,7 @@ functions = [ "SecondaryColorPointer", "SecondaryColorPointerEXT", "SelectBuffer", - "SelectPerfMonitorCountersAMD", "SeparableFilter2D", - "SetFragmentShaderConstantATI", "ShadeModel", "ShaderBinary", "ShaderSource", @@ -1355,8 +1314,6 @@ functions = [ "TexBuffer", "TexBufferARB", "TexBufferRange", - "TexBumpParameterfvATI", - "TexBumpParameterivATI", "TexCoord1d", "TexCoord1dv", "TexCoord1f", @@ -1433,9 +1390,7 @@ functions = [ "TexStorage3D", "TexStorage3DMultisample", "TexSubImage1D", - "TexSubImage1DEXT", "TexSubImage2D", - "TexSubImage2DEXT", "TexSubImage3D", "TexSubImage3DEXT", "TextureBarrierNV", @@ -1444,7 +1399,6 @@ functions = [ "TextureStorage3DEXT", "TextureView", "TransformFeedbackVaryings", - "TransformFeedbackVaryingsEXT", "Translated", "Translatef", "Translatex", -- 2.7.4