From 85e9bbc14d93fa7166c9ae075ee7ae29a8313e3f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 23 Sep 2016 12:10:08 -0700 Subject: [PATCH] Revert "mapi: export all GLES 3.2 functions in libGLESv2.so" This reverts commit e66a2b879b73bf48800fec7353dafe8fc693ecdb. Which breaks the scons build in an interesting way, particularly when BlendBarrier and PrimitiveBoundingBox are added to static_data.py's functions list. This seems to be related to the fact that the unsuffixed names are only in GLES3.2, but Desktop GL only has suffixed versions. Signed-off-by: Dylan Baker --- src/mapi/glapi/gen/static_data.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py index 25e78bf601a..2f403e9b39e 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mapi/glapi/gen/static_data.py @@ -484,22 +484,17 @@ functions = [ "BindVertexBuffer", "BindVertexBuffers", "Bitmap", - "BlendBarrier", "BlendColor", "BlendColorEXT", "BlendEquation", "BlendEquationEXT", - "BlendEquationi", "BlendEquationiARB", "BlendEquationSeparate", - "BlendEquationSeparatei", "BlendEquationSeparateiARB", "BlendFunc", - "BlendFunci", "BlendFunciARB", "BlendFuncSeparate", "BlendFuncSeparateEXT", - "BlendFuncSeparatei", "BlendFuncSeparateiARB", "BlitFramebuffer", "BufferData", @@ -830,7 +825,6 @@ functions = [ "GetFramebufferAttachmentParameteriv", "GetFramebufferAttachmentParameterivEXT", "GetFramebufferParameteriv", - "GetGraphicsResetStatus", "GetGraphicsResetStatusARB", "GetHandleARB", "GetHistogram", @@ -870,11 +864,8 @@ functions = [ "GetnSeparableFilterARB", "GetnTexImageARB", "GetnUniformdvARB", - "GetnUniformfv", "GetnUniformfvARB", - "GetnUniformiv", "GetnUniformivARB", - "GetnUniformuiv", "GetnUniformuivARB", "GetObjectLabel", "GetObjectParameterfvARB", @@ -1169,7 +1160,6 @@ functions = [ "Orthof", "Orthox", "PassThrough", - "PatchParameteri", "PauseTransformFeedback", "PixelMapfv", "PixelMapuiv", @@ -1201,7 +1191,6 @@ functions = [ "PopDebugGroup", "PopMatrix", "PopName", - "PrimitiveBoundingBox", "PrimitiveRestartIndex", "PrimitiveRestartIndexNV", "PrimitiveRestartNV", @@ -1284,7 +1273,6 @@ functions = [ "RasterPos4s", "RasterPos4sv", "ReadBuffer", - "ReadnPixels", "ReadnPixelsARB", "ReadPixels", "Rectd", -- 2.30.2