Import fixes from X.org tree (Søren Sandmann <sandmann@redhat.com>).

[mesa.git] / src / glx / x11 / indirect_size.c

diff --git a/src/glx/x11/indirect_size.c b/src/glx/x11/indirect_size.c
index ae2b14c6c3a479f1c1317ff35ea02ff4a1341625..ae6939bc12eaf56d59b230d3bb23dbf2a69d5474 100644 (file)
--- a/src/glx/x11/indirect_size.c
+++ b/src/glx/x11/indirect_size.c
@@ -132,6 +132,7 @@ __glLightModelfv_size( GLenum e )
         case GL_LIGHT_MODEL_LOCAL_VIEWER:
         case GL_LIGHT_MODEL_TWO_SIDE:
         case GL_LIGHT_MODEL_COLOR_CONTROL:
+/*      case GL_LIGHT_MODEL_COLOR_CONTROL_EXT:*/
             return 1;
         case GL_LIGHT_MODEL_AMBIENT:
             return 4;
@@ -302,15 +303,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;