bring in changes from 6.4 branch

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

diff --git a/src/glx/x11/compsize.c b/src/glx/x11/compsize.c
index 973b640a87728d947203ab34e61e6c02c9a82b2a..193570c84861be49a35f122530bf64377219ae2e 100644 (file)
--- a/src/glx/x11/compsize.c
+++ b/src/glx/x11/compsize.c
@@ -159,9 +159,12 @@ GLint __glImageSize(GLsizei width, GLsizei height, GLsizei depth,
     case GL_PROXY_TEXTURE_4D_SGIS:
     case GL_PROXY_TEXTURE_CUBE_MAP:
     case GL_PROXY_TEXTURE_RECTANGLE_ARB:
+    case GL_PROXY_HISTOGRAM:
     case GL_PROXY_COLOR_TABLE:
+    case GL_PROXY_TEXTURE_COLOR_TABLE_SGI:
     case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
     case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
+    case GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP:
        return 0;
     }