diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dlist.c | 24 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 28 |
2 files changed, 26 insertions, 26 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 3457b00d8ce..8be01cfb7dc 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -7925,11 +7925,11 @@ _mesa_init_dlist_table(struct _glapi_table *table) SET_CopyConvolutionFilter1D(table, exec_CopyConvolutionFilter1D); SET_CopyConvolutionFilter2D(table, exec_CopyConvolutionFilter2D); SET_GetColorTable(table, exec_GetColorTable); - SET_GetColorTableEXT(table, exec_GetColorTable); + SET_GetColorTableSGI(table, exec_GetColorTable); SET_GetColorTableParameterfv(table, exec_GetColorTableParameterfv); - SET_GetColorTableParameterfvEXT(table, exec_GetColorTableParameterfv); + SET_GetColorTableParameterfvSGI(table, exec_GetColorTableParameterfv); SET_GetColorTableParameteriv(table, exec_GetColorTableParameteriv); - SET_GetColorTableParameterivEXT(table, exec_GetColorTableParameteriv); + SET_GetColorTableParameterivSGI(table, exec_GetColorTableParameteriv); SET_GetConvolutionFilter(table, exec_GetConvolutionFilter); SET_GetConvolutionFilterEXT(table, exec_GetConvolutionFilter); SET_GetConvolutionParameterfv(table, exec_GetConvolutionParameterfv); @@ -7971,6 +7971,15 @@ _mesa_init_dlist_table(struct _glapi_table *table) SET_TexSubImage3DEXT(table, save_TexSubImage3D); #endif + /* 14. GL_SGI_color_table */ +#if 0 + SET_ColorTableSGI(table, save_ColorTable); + SET_ColorSubTableSGI(table, save_ColorSubTable); +#endif + SET_GetColorTableSGI(table, exec_GetColorTable); + SET_GetColorTableParameterfvSGI(table, exec_GetColorTableParameterfv); + SET_GetColorTableParameterivSGI(table, exec_GetColorTableParameteriv); + /* 30. GL_EXT_vertex_array */ SET_ColorPointerEXT(table, exec_ColorPointerEXT); SET_EdgeFlagPointerEXT(table, exec_EdgeFlagPointerEXT); @@ -7988,15 +7997,6 @@ _mesa_init_dlist_table(struct _glapi_table *table) SET_PointParameterfEXT(table, save_PointParameterfEXT); SET_PointParameterfvEXT(table, save_PointParameterfvEXT); - /* 78. GL_EXT_paletted_texture */ -#if 0 - SET_ColorTableEXT(table, save_ColorTable); - SET_ColorSubTableEXT(table, save_ColorSubTable); -#endif - SET_GetColorTableEXT(table, exec_GetColorTable); - SET_GetColorTableParameterfvEXT(table, exec_GetColorTableParameterfv); - SET_GetColorTableParameterivEXT(table, exec_GetColorTableParameteriv); - /* 97. GL_EXT_compiled_vertex_array */ SET_LockArraysEXT(table, exec_LockArraysEXT); SET_UnlockArraysEXT(table, exec_UnlockArraysEXT); diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 6e620382af2..b40a5dc5517 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); |