From e089a0e2ee4a0546df73fdf76a40395d6d9ceb52 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 5 Dec 2011 15:12:07 -0800
Subject: [PATCH] glapi: Remove mention of nonexistent enums

glext.h doesn't have GL_MIN_PROGRAM_TEXEL_OFFSET_EXT or
GL_MAX_PROGRAM_TEXEL_OFFSET_EXT.  Using them in the XML causes code to
be generated for the xserver that won't compile.  Use the names that
exist instead.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
 src/mapi/glapi/gen/EXT_gpu_shader4.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index 7a8944ea3b4..bf2f6a3ed21 100644
--- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -31,10 +31,15 @@
     <enum name="UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT"      value="0x8DD6"/>
     <enum name="UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT"      value="0x8DD7"/>
     <enum name="UNSIGNED_INT_SAMPLER_BUFFER_EXT"        value="0x8DD8"/>
-    <enum name="MIN_PROGRAM_TEXEL_OFFSET_EXT"           value="0x8904">
+
+    <!-- There is no MIN_PROGRAM_TEXEL_OFFSET_EXT in glext.h.  There is
+         MIN_PROGRAM_TEXEL_OFFSET_NV and MIN_PROGRAM_TEXEL_OFFSET (OpenGL
+         3.0).  Same goes for MAX_PROGRAM_TEXEL_OFFSET_EXT.
+    -->
+    <enum name="MIN_PROGRAM_TEXEL_OFFSET"               value="0x8904">
         <size name="Get" mode="get"/>
     </enum>
-    <enum name="MAX_PROGRAM_TEXEL_OFFSET_EXT"           value="0x8905">
+    <enum name="MAX_PROGRAM_TEXEL_OFFSET"               value="0x8905">
         <size name="Get" mode="get"/>
     </enum>
 
-- 
2.30.2