Fix some get / set errors with COLOR_TABLE_*. SCALE and BIAS can be

parameters to GetColorTableParameter[if]v.  FORMAT, WIDTH, and the SIZE
enums cannot be parameters to ColorTableParameter[if]v.

diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index ae2b14c6c3a479f1c1317ff35ea02ff4a1341625..c21e1ee086f8447a6c84916865b487c88c49a538 100644 (file)
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -302,15 +302,6 @@ INTERNAL PURE FASTCALL GLint
 __glColorTableParameterfv_size( GLenum e )
 {
     switch( e ) {
-        case GL_COLOR_TABLE_FORMAT:
-        case GL_COLOR_TABLE_WIDTH:
-        case GL_COLOR_TABLE_RED_SIZE:
-        case GL_COLOR_TABLE_GREEN_SIZE:
-        case GL_COLOR_TABLE_BLUE_SIZE:
-        case GL_COLOR_TABLE_ALPHA_SIZE:
-        case GL_COLOR_TABLE_LUMINANCE_SIZE:
-        case GL_COLOR_TABLE_INTENSITY_SIZE:
-            return 1;
         case GL_COLOR_TABLE_SCALE:
         case GL_COLOR_TABLE_BIAS:
             return 4;

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index d3c4d81684793a3e04b832563ff34111500e04af..f76e355e52ad6b1de6dbb6599dfe80cfdf8d186a 100644 (file)
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -3202,42 +3202,46 @@ glx:
     <enum name="COLOR_TABLE_SCALE"             count="4"  value="0x80D6">
         <size name="ColorTableParameterfv"/>
         <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_BIAS"              count="4"  value="0x80D7">
         <size name="ColorTableParameterfv"/>
         <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_FORMAT"            count="1"  value="0x80D8">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_WIDTH"             count="1"  value="0x80D9">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_RED_SIZE"          count="1"  value="0x80DA">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_GREEN_SIZE"        count="1"  value="0x80DB">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_BLUE_SIZE"         count="1"  value="0x80DC">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_ALPHA_SIZE"        count="1"  value="0x80DD">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_LUMINANCE_SIZE"    count="1"  value="0x80DE">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>
     <enum name="COLOR_TABLE_INTENSITY_SIZE"    count="1"  value="0x80DF">
-        <size name="ColorTableParameterfv"/>
-        <size name="ColorTableParameteriv"/>
+        <size name="GetColorTableParameterfv" mode="get"/>
+        <size name="GetColorTableParameteriv" mode="get"/>
     </enum>