GL_EXT_paletted_texture functions should alias GL_SGI_color_table functions.

The functions for GL_EXT_paletted_texture that do not share GLX
protocol with GL_ARB_imaging are supposed to alias the similar
functions from GL_SGI_color_table.  They didn't.  This patch corrects
this problem and enables GLX protocol for both extensions.

Since this removes 3 entries from the dispatch table, this change
creates a lot of changes in the generated files.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 2b736a4550..cfabd11b34 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -716,9 +716,6 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(VertexPointerEXT, _gloffset_VertexPointerEXT, VertexPointerEXT@20)
 	GL_STUB(PointParameterfEXT, _gloffset_PointParameterfEXT, PointParameterfEXT@8)
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB(GetColorTableEXT, _gloffset_GetColorTableEXT, GetColorTableEXT@16)
-	GL_STUB(GetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfvEXT, GetColorTableParameterfvEXT@12)
-	GL_STUB(GetColorTableParameterivEXT, _gloffset_GetColorTableParameterivEXT, GetColorTableParameterivEXT@12)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
 	GL_STUB(CullParameterdvEXT, _gloffset_CullParameterdvEXT, CullParameterdvEXT@8)
@@ -882,14 +879,14 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
 	GL_STUB(ActiveStencilFaceEXT, _gloffset_ActiveStencilFaceEXT, ActiveStencilFaceEXT@4)
-	GL_STUB(_dispatch_stub_741, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_741@4)
+	GL_STUB(_dispatch_stub_738, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_738@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
+	GL_STUB(_dispatch_stub_739, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_739@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_739, _dispatch_stub_739@8))
+	GL_STUB(_dispatch_stub_740, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_740@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@8))
+	GL_STUB(_dispatch_stub_741, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_741@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_741, _dispatch_stub_741@4))
-	GL_STUB(_dispatch_stub_742, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_742@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_742, _dispatch_stub_742@8))
-	GL_STUB(_dispatch_stub_743, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_743@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@8))
-	GL_STUB(_dispatch_stub_744, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_744@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
@@ -918,10 +915,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
 	GL_STUB(BlitFramebufferEXT, _gloffset_BlitFramebufferEXT, BlitFramebufferEXT@40)
-	GL_STUB(_dispatch_stub_773, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_773@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@16))
-	GL_STUB(_dispatch_stub_774, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_774@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@16))
+	GL_STUB(_dispatch_stub_770, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_770@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_770, _dispatch_stub_770@16))
+	GL_STUB(_dispatch_stub_771, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_771@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_771, _dispatch_stub_771@16))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1026,6 +1023,9 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(GetQueryiv, _gloffset_GetQueryivARB, GetQueryiv@12, GetQueryivARB, GetQueryivARB@12)
 	GL_STUB_ALIAS(IsQuery, _gloffset_IsQueryARB, IsQuery@4, IsQueryARB, IsQueryARB@4)
 	GL_STUB_ALIAS(DrawBuffersATI, _gloffset_DrawBuffersARB, DrawBuffersATI@8, DrawBuffersARB, DrawBuffersARB@8)
+	GL_STUB_ALIAS(GetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfvSGI, GetColorTableParameterfvEXT@12, GetColorTableParameterfvSGI, GetColorTableParameterfvSGI@12)
+	GL_STUB_ALIAS(GetColorTableParameterivEXT, _gloffset_GetColorTableParameterivSGI, GetColorTableParameterivEXT@12, GetColorTableParameterivSGI, GetColorTableParameterivSGI@12)
+	GL_STUB_ALIAS(GetColorTableEXT, _gloffset_GetColorTableSGI, GetColorTableEXT@16, GetColorTableSGI, GetColorTableSGI@16)
 	GL_STUB_ALIAS(SampleMaskEXT, _gloffset_SampleMaskSGIS, SampleMaskEXT@8, SampleMaskSGIS, SampleMaskSGIS@8)
 	GL_STUB_ALIAS(SamplePatternEXT, _gloffset_SamplePatternSGIS, SamplePatternEXT@4, SamplePatternSGIS, SamplePatternSGIS@4)
 	GL_STUB_ALIAS(PointParameterf, _gloffset_PointParameterfEXT, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)