diff options
| author | Paul Berry <[email protected]> | 2012-02-15 10:35:10 -0800 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-02-23 09:35:44 -0800 |
| commit | bc39de8c0b6bb19e411cfa8606f189c4868a5f01 (patch) | |
| tree | 00dcc80ddb92b3c49aeec9a73682cae7acbeebb0 /src | |
| parent | 4a72d859b4f8d0444eb7f38606d59d7ddc9ea8fa (diff) | |
glapi: Fix incorrect enum value.
From http://www.opengl.org/registry/specs/ARB/seamless_cube_map.txt:
Accepted by the <cap> parameter of Enable, Disable and IsEnabled,
and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv
and GetDoublev:
TEXTURE_CUBE_MAP_SEAMLESS 0x884F
This caused a change in enums.c, which is manually built from the .xml
files.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_seamless_cube_map.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/enums.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mapi/glapi/gen/ARB_seamless_cube_map.xml b/src/mapi/glapi/gen/ARB_seamless_cube_map.xml index 8dc827c5a89..84e8aa8ae18 100644 --- a/src/mapi/glapi/gen/ARB_seamless_cube_map.xml +++ b/src/mapi/glapi/gen/ARB_seamless_cube_map.xml @@ -4,7 +4,7 @@ <OpenGLAPI> <category name="GL_ARB_seamless_cube_map" number="65"> - <enum name="TEXTURE_CUBE_MAP_SEAMLESS" count="1" value="0x88F4"> + <enum name="TEXTURE_CUBE_MAP_SEAMLESS" count="1" value="0x884F"> <size name="Get" mode="get"/> </enum> </category> diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index b00a738bc9a..c92a9a166f3 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -4460,7 +4460,7 @@ static const enum_elt all_enums[2340] = { 45645, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */ { 45676, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */ { 45711, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */ - { 45746, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ + { 45746, 0x0000884F }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ { 45775, 0x00008071 }, /* GL_TEXTURE_DEPTH */ { 45792, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */ { 45814, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */ @@ -4723,7 +4723,7 @@ static const enum_elt all_enums[2340] = { 52477, 0x00000D17 }, /* GL_ZOOM_Y */ }; -static const unsigned reduced_enums[1571] = +static const unsigned reduced_enums[1572] = { 556, /* GL_FALSE */ 853, /* GL_LINES */ @@ -5806,6 +5806,7 @@ static const unsigned reduced_enums[1571] = 2038, /* GL_TEXTURE_COMPARE_MODE */ 2036, /* GL_TEXTURE_COMPARE_FUNC */ 284, /* GL_COMPARE_REF_TO_TEXTURE */ + 2079, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ 1400, /* GL_POINT_SPRITE */ 347, /* GL_COORD_REPLACE */ 1405, /* GL_POINT_SPRITE_R_MODE_NV */ @@ -5917,7 +5918,7 @@ static const unsigned reduced_enums[1571] = 1368, /* GL_PIXEL_UNPACK_BUFFER_BINDING */ 400, /* GL_DEPTH24_STENCIL8 */ 2134, /* GL_TEXTURE_STENCIL_SIZE */ - 2079, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */ + 1096, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ 1094, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */ 1097, /* GL_MAX_PROGRAM_IF_DEPTH_NV */ 1101, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */ |