diff options
| author | Brian Paul <brianp@vmware.com> | 2010-05-11 21:40:25 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-05-11 21:40:56 -0600 |
| commit | 903986ca128d51ff031cc9eafa1976618834a8de (patch) | |
| tree | 91ac49774f0d5046bd1b4e2a51234c80ade5dec7 | |
| parent | 6c06e2f053f18d9bc7d36ea52691c53456811c73 (diff) | |
glapi: fix generator scripts w.r.t. GLX_USE_APPLEGL
Commit 80b280db883edc9550484dba03bd5c124b6a9bf9 changed the .c files
instead of the .py generator scripts.
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 2 | ||||
| -rw-r--r-- | 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 c52b85bfb4..e732282073 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 95cb5110cc..f16ea4c3b6 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' |