diff options
| author | Matt Turner <[email protected]> | 2012-01-24 11:34:42 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-24 11:34:42 -0500 |
| commit | 027ce0c493a85c863df88b43f61aea34bcd4cd58 (patch) | |
| tree | f845bb4ce46ffe9dfa3e77ed88f51d4e354ade96 /src/mapi/glapi/gen/glX_proto_send.py | |
| parent | a208468e04353239f2876cc2013f860b48a4f1c1 (diff) | |
Revert "Always build shared glapi"
This reverts commit adefee50d954151f76150af80207081ae3c247d9.
Shared glapi was never tested with --enable-xlib-glx and turns out
to cause a lot of problems.
Conflicts:
configure.ac
Diffstat (limited to 'src/mapi/glapi/gen/glX_proto_send.py')
| -rw-r--r-- | src/mapi/glapi/gen/glX_proto_send.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mapi/glapi/gen/glX_proto_send.py b/src/mapi/glapi/gen/glX_proto_send.py index 29bf0808bac..bec0222188f 100644 --- a/src/mapi/glapi/gen/glX_proto_send.py +++ b/src/mapi/glapi/gen/glX_proto_send.py @@ -361,6 +361,8 @@ const GLuint __glXDefaultPixelStore[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 1 }; procs[n] = func.static_glx_name(n) print """ +#ifdef GLX_SHARED_GLAPI + static const struct proc_pair { const char *name; @@ -394,6 +396,8 @@ __indirect_get_proc_address(const char *name) return (pair) ? pair->proc : NULL; } + +#endif /* GLX_SHARED_GLAPI */ """ return @@ -1047,7 +1051,9 @@ extern _X_HIDDEN NOINLINE FASTCALL GLubyte * __glXSetupVendorRequest( break print '' + print '#ifdef GLX_SHARED_GLAPI' print 'extern _X_HIDDEN void (*__indirect_get_proc_address(const char *name))(void);' + print '#endif' def show_usage(): |