Synchronised files

8 files changed, 49 insertions, 24 deletions

diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index 7c25143cf..1d5d9d8bd 100644
--- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -31,10 +31,10 @@
     <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">

+    <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>

 

diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index cec9c916e..6c7b14bf3 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -32,8 +32,12 @@
   <enum name="RGB16F"                           value="0x881B"/>
   <enum name="VERTEX_ATTRIB_ARRAY_INTEGER"      value="0x88FD"/>
   <enum name="MAX_ARRAY_TEXTURE_LAYERS"         value="0x88FF"/>
-  <enum name="MIN_PROGRAM_TEXEL_OFFSET"         value="0x8904"/>
-  <enum name="MAX_PROGRAM_TEXEL_OFFSET"         value="0x8905"/>
+  <enum name="MIN_PROGRAM_TEXEL_OFFSET"         value="0x8904">
+      <size name="Get" mode="get"/>
+  </enum>
+  <enum name="MAX_PROGRAM_TEXEL_OFFSET"         value="0x8905">
+      <size name="Get" mode="get"/>
+  </enum>
   <enum name="CLAMP_READ_COLOR"                 value="0x891C"/>
   <enum name="FIXED_ONLY"                       value="0x891D"/>
   <enum name="MAX_VARYING_COMPONENTS"           value="0x8B4B"/>
diff --git a/mesalib/src/mapi/glapi/gen/glX_API.xml b/mesalib/src/mapi/glapi/gen/glX_API.xml
index 7e6a06685..ac2f4ace1 100644
--- a/mesalib/src/mapi/glapi/gen/glX_API.xml
+++ b/mesalib/src/mapi/glapi/gen/glX_API.xml
@@ -217,18 +217,4 @@
     </function>

 </category>

 

-<category name="GLX_ARB_create_context" number="56">

-    <function name="SetClientInfoARB">

-        <glx sop="33"/>

-    </function>

-

-    <function name="CreateContextAttribsARB">

-        <glx sop="34"/>

-    </function>

-

-    <function name="SetClientInfo2ARB">

-        <glx sop="35"/>

-    </function>

-</category>

-

 </OpenGLAPI>

diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
index 10b4e368d..190ba8132 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_recv.py
@@ -77,6 +77,14 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
 

 

 	def printRealHeader(self):

+		print '#ifdef HAVE_DIX_CONFIG_H'

+		print '#include <dix-config.h>'

+		print '#else'

+		print ''

+		print '#include "glheader.h"'

+		print ''

+		print '#endif'

+		print ''

 		print '#include <X11/Xmd.h>'

 		print '#include <GL/gl.h>'

 		print '#include <GL/glxproto.h>'

@@ -92,7 +100,7 @@ class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto):
 		print '#include "glapi.h"'

 		print '#include "glapitable.h"'

 		print '#include "glthread.h"'

-		print '#include "glapidispatch.h"'

+		print '#include "dispatch.h"'

 		print ''

 		print '#define __GLX_PAD(x)  (((x) + 3) & ~3)'

 		print ''

diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_size.py b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
index f16ea4c3b..c8c0ad82a 100644
--- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py
+++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py
@@ -313,6 +313,14 @@ class PrintGlxSizeStubs_common(gl_XML.gl_print_base):
 class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
 	def printRealHeader(self):
 		print ''
+		print '#ifdef HAVE_DIX_CONFIG_H'
+		print '#include <dix-config.h>'
+		print '#else'
+		print ''
+		print '#include "glheader.h"'
+		print ''
+		print '#endif'
+		print ''
 		print '#include <GL/gl.h>'
 		if self.emit_get:
 			print '#include "indirect_size_get.h"'
@@ -445,6 +453,14 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common):
 
 	def printRealHeader(self):
 		print ''
+		print '#ifdef HAVE_DIX_CONFIG_H'
+		print '#include <dix-config.h>'
+		print '#else'
+		print ''
+		print '#include "glheader.h"'
+		print ''
+		print '#endif'
+		print ''
 		print '#include <GL/gl.h>'
 		print '#include "glxserver.h"'
 		print '#include "glxbyteorder.h"'
diff --git a/mesalib/src/mapi/glapi/gen/glX_server_table.py b/mesalib/src/mapi/glapi/gen/glX_server_table.py
index f3962f875..95ecc8ea3 100644
--- a/mesalib/src/mapi/glapi/gen/glX_server_table.py
+++ b/mesalib/src/mapi/glapi/gen/glX_server_table.py
@@ -357,12 +357,15 @@ class PrintGlxDispatchTables(glX_proto_common.glx_print_proto):
 
 
 	def printRealHeader(self):
+		print '#ifndef HAVE_DIX_CONFIG_H'
+		print '#include "glheader.h"'
+		print '#endif'
+		print ''
 		print '#include <inttypes.h>'
 		print '#include "glxserver.h"'
 		print '#include "glxext.h"'
 		print '#include "indirect_dispatch.h"'
 		print '#include "indirect_reqsize.h"'
-		print '#include "g_disptab.h"'
 		print '#include "indirect_table.h"'
 		print ''
 		return
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 814238a76..28d9fb104 100644
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -34,7 +34,11 @@ import gl_XML, glX_XML
 import sys, getopt
 
 header = """
-#if defined(DEBUG) && !defined(_WIN32_WCE)
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 #endif
 
@@ -47,11 +51,15 @@ header = """
 #include "glapi.h"
 #include "glapitable.h"
 
+#include "os.h"
+
 static void
 __glapi_gentable_NoOp(void) {
 #if defined(DEBUG) && !defined(_WIN32_WCE)
     if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
         const char *fstr = "Unknown";
+
+#ifdef HAVE_BACKTRACE
         void *frames[2];
 
         if(backtrace(frames, 2) == 2) {
@@ -60,8 +68,9 @@ __glapi_gentable_NoOp(void) {
             if(info.dli_sname)
                 fstr = info.dli_sname;
         }
+#endif
 
-        fprintf(stderr, "Call to unimplemented API: %s\\n", fstr);
+        LogMessage(X_ERROR, "GLX: Call to unimplemented API: %s\\n", fstr);
     }
 #endif
 }
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index 46b6bb7cd..762f67c67 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -81,6 +81,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
 
 	def printRealHeader(self):
 		print """
+#include "glapitable.h"
 /**
  * \\file main/dispatch.h
  * Macros for handling GL dispatch tables.
@@ -91,8 +92,6 @@ class PrintRemapTable(gl_XML.gl_print_base):
  * can SET_FuncName, are used to get and set the dispatch pointer for the
  * named function in the specified dispatch table.
  */
-
-#include "main/mfeatures.h"
 """
 		return