diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-08-24 21:42:38 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-08-24 21:42:38 +0000 |
| commit | a5f2206077402f0a8700ec1348e09731e53c5bc2 (patch) | |
| tree | 6de5fbc0d45deb5ef1418a078c2077d52ec24b48 /src/mesa/main/state.c | |
| parent | bf83e652f6d023f1cdcf83ec3ebac024dc0032dc (diff) | |
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.
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 6e620382af..b40a5dc551 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -356,11 +356,11 @@ _mesa_init_exec_table(struct _glapi_table *exec) SET_CopyConvolutionFilter1D(exec, _mesa_CopyConvolutionFilter1D); SET_CopyConvolutionFilter2D(exec, _mesa_CopyConvolutionFilter2D); SET_GetColorTable(exec, _mesa_GetColorTable); - SET_GetColorTableEXT(exec, _mesa_GetColorTable); + SET_GetColorTableSGI(exec, _mesa_GetColorTable); SET_GetColorTableParameterfv(exec, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameterfvEXT(exec, _mesa_GetColorTableParameterfv); + SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv); SET_GetColorTableParameteriv(exec, _mesa_GetColorTableParameteriv); - SET_GetColorTableParameterivEXT(exec, _mesa_GetColorTableParameteriv); + SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv); SET_GetConvolutionFilter(exec, _mesa_GetConvolutionFilter); SET_GetConvolutionFilterEXT(exec, _mesa_GetConvolutionFilter); SET_GetConvolutionParameterfv(exec, _mesa_GetConvolutionParameterfv); @@ -420,6 +420,17 @@ _mesa_init_exec_table(struct _glapi_table *exec) SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv); #endif + /* 14. SGI_color_table */ +#if 0 + SET_ColorTableSGI(exec, _mesa_ColorTable); + SET_ColorSubTableSGI(exec, _mesa_ColorSubTable); +#endif +#if _HAVE_FULL_GL + SET_GetColorTableSGI(exec, _mesa_GetColorTable); + SET_GetColorTableParameterfvSGI(exec, _mesa_GetColorTableParameterfv); + SET_GetColorTableParameterivSGI(exec, _mesa_GetColorTableParameteriv); +#endif + /* 30. GL_EXT_vertex_array */ #if _HAVE_FULL_GL SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT); @@ -441,17 +452,6 @@ _mesa_init_exec_table(struct _glapi_table *exec) SET_PointParameterfvEXT(exec, _mesa_PointParameterfvEXT); #endif - /* 78. GL_EXT_paletted_texture */ -#if 0 - SET_ColorTableEXT(exec, _mesa_ColorTableEXT); - SET_ColorSubTableEXT(exec, _mesa_ColorSubTableEXT); -#endif -#if _HAVE_FULL_GL - SET_GetColorTableEXT(exec, _mesa_GetColorTable); - SET_GetColorTableParameterfvEXT(exec, _mesa_GetColorTableParameterfv); - SET_GetColorTableParameterivEXT(exec, _mesa_GetColorTableParameteriv); -#endif - /* 97. GL_EXT_compiled_vertex_array */ #if _HAVE_FULL_GL SET_LockArraysEXT(exec, _mesa_LockArraysEXT); |