mesa: Branch 'master' - 2 commits

[Ian Romanick]

 src/mesa/glapi/gl_API.xml |    2 +-
 src/mesa/main/enums.c     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree fa8961069c5a99f118deeb5c0217e7c7e1de5f1a (from parents)
Merge: 091be1119050f8cd158161aa3960b1f4260cd790 a510bc3ee1a696da120c09ee4ec33dc033f671ac
Author: Ian Romanick <idr at us.ibm.com>
Date:   Tue Mar 6 11:50:33 2007 -0800

    Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa

diff-tree 091be1119050f8cd158161aa3960b1f4260cd790 (from a4b344baa2484c65a1618f3cce3a94c91dea8ef7)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Tue Mar 6 11:50:21 2007 -0800

    Fix cut-and-paste error in the name of GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB.

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index bd31e88..2821503 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -6091,7 +6091,7 @@
         <size name="GetTexLevelParameterfv" mode="get"/>
         <size name="GetTexLevelParameteriv" mode="get"/>
     </enum>
-    <enum name="NUM_TEXTURE_COMPRESSED_FORMATS_ARB" count="1" value="0x86A2">
+    <enum name="NUM_COMPRESSED_TEXTURE_FORMATS_ARB" count="1" value="0x86A2">
         <size name="Get" mode="get"/>
     </enum>
     <enum name="TEXTURE_COMPRESSED_FORMATS_ARB"           value="0x86A3"/>
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 8c1b785..bad33f7 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1003,7 +1003,7 @@ LONGSTRING static const char enum_string
    "GL_NOTEQUAL\0"
    "GL_NO_ERROR\0"
    "GL_NUM_COMPRESSED_TEXTURE_FORMATS\0"
-   "GL_NUM_TEXTURE_COMPRESSED_FORMATS_ARB\0"
+   "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB\0"
    "GL_OBJECT_ACTIVE_ATTRIBUTES_ARB\0"
    "GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB\0"
    "GL_OBJECT_ACTIVE_UNIFORMS_ARB\0"
@@ -2744,7 +2744,7 @@ static const enum_elt all_enums[1737] =
    { 20205, 0x00000205 }, /* GL_NOTEQUAL */
    { 20217, 0x00000000 }, /* GL_NO_ERROR */
    { 20229, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 20263, 0x000086A2 }, /* GL_NUM_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 20263, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
    { 20301, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
    { 20333, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
    { 20375, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */