From 336bad93d146931c160d8517edfdf0bee49ad9f7 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 6 Jul 2012 09:12:35 +0200
Subject: randrproto fontconfig mesa xserver git update 6 Jul 2012

---
 mesalib/src/mapi/glapi/gen/es_EXT.xml |  8 ++++++++
 mesalib/src/mapi/glapi/glapi_priv.h   | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'mesalib/src/mapi')

diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml
index b26cac54b..ad83d9142 100644
--- a/mesalib/src/mapi/glapi/gen/es_EXT.xml
+++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml
@@ -634,4 +634,12 @@
     </function>
 </category>
 
+<!-- 103. GL_EXT_texture_rg -->
+<category name="GL_EXT_texture_rg" number="103">
+    <enum name="RED_EXT"                                  value="0x1903"/>
+    <enum name="RG_EXT"                                   value="0x8227"/>
+    <enum name="R8_EXT"                                   value="0x8229"/>
+    <enum name="RG8_EXT"                                  value="0x822B"/>
+</category>
+
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/glapi_priv.h b/mesalib/src/mapi/glapi/glapi_priv.h
index b6600c5fc..3ab553a2b 100644
--- a/mesalib/src/mapi/glapi/glapi_priv.h
+++ b/mesalib/src/mapi/glapi/glapi_priv.h
@@ -38,16 +38,6 @@
 #include "GL/gl.h"
 #include "GL/glext.h"
 
-/* The define of GL_COVERAGE_SAMPLES_NV in gl2ext.h is guarded by a different
- * extension (GL_NV_coverage_sample) than in glext.h
- * (GL_NV_multisample_coverage).  Just undefine it to avoid spurious compiler
- * warnings.
- */
-#undef GL_COVERAGE_SAMPLES_NV
-
-#include "GLES2/gl2platform.h"
-#include "GLES2/gl2ext.h"
-
 #ifndef GL_OES_fixed_point
 typedef int GLfixed;
 typedef int GLclampx;
-- 
cgit v1.2.3