summaryrefslogtreecommitdiff
path: root/src/mapi
diff options
context:
space:
mode:
authorChris Forbes <chrisf@ijw.co.nz>2013-10-03 14:10:08 +1300
committerChris Forbes <chrisf@ijw.co.nz>2013-10-03 21:38:48 +1300
commitd1335926196c216f1abe73f37cfcb61cf7f2bd28 (patch)
tree70a643213e578e69b9856a23481fbb02b472e05d /src/mapi
parent61519f15aceae3e986a6e287e69684a01de3221a (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 <chrisf@ijw.co.nz> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70054 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/gen/ARB_texture_gather.xml6
-rw-r--r--src/mapi/glapi/gen/Makefile.am1
2 files changed, 5 insertions, 2 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 \