diff options
| author | Chris Forbes <[email protected]> | 2013-10-03 14:10:08 +1300 |
|---|---|---|
| committer | Chris Forbes <[email protected]> | 2013-10-03 21:38:48 +1300 |
| commit | d1335926196c216f1abe73f37cfcb61cf7f2bd28 (patch) | |
| tree | 70a643213e578e69b9856a23481fbb02b472e05d | |
| parent | 61519f15aceae3e986a6e287e69684a01de3221a (diff) | |
mesa: fix make check for ARB_texture_gather
Clean up inconsistency in enum decoration:
- Use the undecorated enums where possible.
- MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB remains decorated, since it
has no undecorated equivalent in GL4.
Signed-off-by: Chris Forbes <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70054
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_texture_gather.xml | 6 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 4 | ||||
| -rw-r--r-- | src/mesa/main/tests/enum_strings.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/mapi/glapi/gen/ARB_texture_gather.xml b/src/mapi/glapi/gen/ARB_texture_gather.xml index 01c7b88ff66..41714aced87 100644 --- a/src/mapi/glapi/gen/ARB_texture_gather.xml +++ b/src/mapi/glapi/gen/ARB_texture_gather.xml @@ -5,8 +5,10 @@ <category name="GL_ARB_texture_gather" number="72"> - <enum name="MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB" value="0x8E5E"/> - <enum name="MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB" value="0x8E5F"/> + <enum name="MIN_PROGRAM_TEXTURE_GATHER_OFFSET" value="0x8E5E"/> + <enum name="MAX_PROGRAM_TEXTURE_GATHER_OFFSET" value="0x8E5F"/> + + <!-- This exists only in the ARB extension; not in GL4 --> <enum name="MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB" value="0x8F9F"/> </category> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 9b9b99505f6..6bb2f1ec7e3 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -111,6 +111,7 @@ API_XML = \ ARB_texture_buffer_range.xml \ ARB_texture_compression_rgtc.xml \ ARB_texture_float.xml \ + ARB_texture_gather.xml \ ARB_texture_rg.xml \ ARB_texture_storage.xml \ ARB_vertex_array_object.xml \ diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 29cad26ff28..e80a23c111a 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -718,8 +718,8 @@ descriptor=[ [ "TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB", "LOC_CUSTOM, TYPE_INT, TEXTURE_CUBE_ARRAY_INDEX, extra_ARB_texture_cube_map_array" ], # GL_ARB_texture_gather - [ "MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB", "CONTEXT_INT(Const.MinProgramTextureGatherOffset), extra_ARB_texture_gather"], - [ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherOffset), extra_ARB_texture_gather"], + [ "MIN_PROGRAM_TEXTURE_GATHER_OFFSET", "CONTEXT_INT(Const.MinProgramTextureGatherOffset), extra_ARB_texture_gather"], + [ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET", "CONTEXT_INT(Const.MaxProgramTextureGatherOffset), extra_ARB_texture_gather"], [ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherComponents), extra_ARB_texture_gather"], ]}, diff --git a/src/mesa/main/tests/enum_strings.cpp b/src/mesa/main/tests/enum_strings.cpp index 6994f79fee5..8a3103b635f 100644 --- a/src/mesa/main/tests/enum_strings.cpp +++ b/src/mesa/main/tests/enum_strings.cpp @@ -1789,7 +1789,7 @@ const struct enum_info everything[] = { { 0x8F9C, "GL_SIGNED_NORMALIZED" }, { 0x8F9D, "GL_PRIMITIVE_RESTART" }, { 0x8F9E, "GL_PRIMITIVE_RESTART_INDEX" }, - { 0x8F9F, "GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS" }, + { 0x8F9F, "GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB" }, { 0x906F, "GL_RGB10_A2UI" }, { 0x9100, "GL_TEXTURE_2D_MULTISAMPLE" }, { 0x9101, "GL_PROXY_TEXTURE_2D_MULTISAMPLE" }, |