From 09c0aa163ab00fcf51c0a217c5efec55e32361d6 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 7 Nov 2011 08:32:50 +0100 Subject: Synchronised files --- mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml | 4 ++-- mesalib/src/mapi/glapi/gen/GL3x.xml | 8 ++++++-- mesalib/src/mapi/glapi/gen/glX_API.xml | 14 -------------- mesalib/src/mapi/glapi/gen/glX_proto_recv.py | 10 +++++++++- mesalib/src/mapi/glapi/gen/glX_proto_size.py | 16 ++++++++++++++++ mesalib/src/mapi/glapi/gen/glX_server_table.py | 5 ++++- mesalib/src/mapi/glapi/gen/gl_gentable.py | 13 +++++++++++-- mesalib/src/mapi/glapi/gen/gl_table.py | 3 +-- 8 files changed, 49 insertions(+), 24 deletions(-) (limited to 'mesalib/src/mapi/glapi/gen') 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 @@ - + - + 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 @@ - - + + + + + + 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 @@ - - - - - - - - - - - - - - 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 ' + print '#else' + print '' + print '#include "glheader.h"' + print '' + print '#endif' + print '' print '#include ' print '#include ' print '#include ' @@ -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 @@ -312,6 +312,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 ' + print '#else' + print '' + print '#include "glheader.h"' + print '' + print '#endif' print '' print '#include ' if self.emit_get: @@ -444,6 +452,14 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): def printRealHeader(self): + print '' + print '#ifdef HAVE_DIX_CONFIG_H' + print '#include ' + print '#else' + print '' + print '#include "glheader.h"' + print '' + print '#endif' print '' print '#include ' print '#include "glxserver.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 ' 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 +#endif + +#ifdef HAVE_BACKTRACE #include #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 -- cgit v1.2.3