diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-01-03 11:35:59 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-01-04 12:43:10 -0800 |
| commit | 4becf676e0b09b421821b6895251549ec98d4e5d (patch) | |
| tree | 894ffe597aa356454ea45376726f8b43854c99c3 /src/glx/clientinfo.c | |
| parent | c2e537fef26be6f9995f99e04015d0c1ac9ed5ae (diff) | |
| download | external_mesa3d-4becf676e0b09b421821b6895251549ec98d4e5d.zip external_mesa3d-4becf676e0b09b421821b6895251549ec98d4e5d.tar.gz external_mesa3d-4becf676e0b09b421821b6895251549ec98d4e5d.tar.bz2 | |
glx: More hacking around versions of XCB that lack GLX_ARB_create_context support
Detect whether a new enough version of XCB is installed at configure
time. If it is not, don't enable the extension and don't build the
unit tests.
v2: Move the AM_CONDIATION outside the case-statement so that it is
invoked even for non-GLX builds. This prevents build failures with
osmesa, for example.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Robert Hooker <robert.hooker@canonical.com>
Diffstat (limited to 'src/glx/clientinfo.c')
| -rw-r--r-- | src/glx/clientinfo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/glx/clientinfo.c b/src/glx/clientinfo.c index 429e9a3..461030f 100644 --- a/src/glx/clientinfo.c +++ b/src/glx/clientinfo.c @@ -123,6 +123,7 @@ __glX_send_client_info(struct glx_display *glx_dpy) * THE ORDER IS IMPORTANT. We want to send the most recent version of the * protocol that the server can support. */ +#ifdef HAVE_XCB_GLX_CREATE_CONTEXT if (glx_dpy->majorVersion == 1 && glx_dpy->minorVersion == 4 && any_screen_has_ARB_create_context_profile) { xcb_glx_set_client_info_2arb(c, @@ -145,7 +146,9 @@ __glX_send_client_info(struct glx_display *glx_dpy) gl_versions, gl_extension_string, glx_extensions); - } else { + } else +#endif + { xcb_glx_client_info(c, GLX_MAJOR_VERSION, GLX_MINOR_VERSION, gl_extension_length, |