Module: Mesa
Branch: master
Commit: 903986ca128d51ff031cc9eafa1976618834a8de
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=903986ca128d51ff031cc9eafa1976618834a8de
Author: Brian Paul <bri...@vmware.com>
Date: Tue May 11 21:40:25 2010 -0600
glapi: fix generator scripts w.r.t. GLX_USE_APPLEGL
Commit 80b280db883edc9550484dba03bd5c124b6a9bf9 changed the .c files
instead of the .py generator scripts.
---
src/mapi/glapi/gen/glX_proto_send.py | 2 +-
src/mapi/glapi/gen/glX_proto_size.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/gen/glX_proto_send.py
b/src/mapi/glapi/gen/glX_proto_send.py
index c52b85b..e732282 100644
--- a/src/mapi/glapi/gen/glX_proto_send.py
+++ b/src/mapi/glapi/gen/glX_proto_send.py
@@ -373,7 +373,7 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0,
0, 0, 0, 1 };
print '{'
print ' __GLXcontext * const gc =
__glXGetCurrentContext();'
print ''
- print '#ifdef GLX_DIRECT_RENDERING'
+ print '#if defined(GLX_DIRECT_RENDERING) &&
!defined(GLX_USE_APPLEGL)'
print ' if (gc->driContext) {'
print ' %sCALL_%s(GET_DISPATCH(), (%s));' %
(ret_string, func.name, func.get_called_parameter_string())
print ' } else'
diff --git a/src/mapi/glapi/gen/glX_proto_size.py
b/src/mapi/glapi/gen/glX_proto_size.py
index 95cb511..f16ea4c 100644
--- a/src/mapi/glapi/gen/glX_proto_size.py
+++ b/src/mapi/glapi/gen/glX_proto_size.py
@@ -329,7 +329,7 @@ class PrintGlxSizeStubs_c(PrintGlxSizeStubs_common):
self.printVisibility( "INTERNAL", "internal" )
print ''
print ''
- print '#if defined(__CYGWIN__) || defined(__MINGW32__) ||
defined(__APPLE__)'
+ print '#if defined(__CYGWIN__) || defined(__MINGW32__) ||
defined(GLX_USE_APPLEGL)'
print '# undef HAVE_ALIAS'
print '#endif'
print '#ifdef HAVE_ALIAS'
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
