apply previous GL_COMPRESSED_TEXTURE_FORMATS_ARB fix to generator file, and regenerat...

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 78f776ccf622e768ea1cb87222a1fa15dd9cc00b..9b2981059cb78951c8ffbe4d92c6ce27e51e4182 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1082,8 +1082,9 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
+         ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_BOOLEAN(formats[i]);
+            params[i] = ENUM_TO_INT(formats[i]);
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
@@ -2925,8 +2926,9 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
+         ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_BOOLEAN(formats[i]);
+            params[i] = ENUM_TO_INT(formats[i]);
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
@@ -4768,6 +4770,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
+         ASSERT(n <= 100);
          for (i = 0; i < n; i++)
             params[i] = ENUM_TO_INT(formats[i]);
          }

diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 848b593c12cadaadfc3007698af6c87869e74870..b3e6bc58559cf7f97bcf7093783e86ef98879875 100644 (file)
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -508,8 +508,9 @@ StateVars = [
          [],
          """GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
+         ASSERT(n <= 100);
          for (i = 0; i < n; i++)
-            params[i] = ENUM_TO_BOOLEAN(formats[i]);""",
+            params[i] = ENUM_TO_INT(formats[i]);""",
          "ARB_texture_compression" ),
 
        # GL_EXT_compiled_vertex_array