diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-06 16:27:23 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-06 16:27:23 -0700 |
| commit | 0af1c6b5d1e2a5560f92b93b5429f70b49449ddb (patch) | |
| tree | 476e68f16d7e38f2f4047a842e7a482e90726be4 /src/mesa/main | |
| parent | e69da9d02ecdf47d930276783f8b8df1a3cd99dd (diff) | |
| parent | fa8961069c5a99f118deeb5c0217e7c7e1de5f1a (diff) | |
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/enums.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index 8c1b785aab..bad33f7f64 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -1003,7 +1003,7 @@ LONGSTRING static const char enum_string_table[] = "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 */ |