diff options
| author | Ian Romanick <[email protected]> | 2012-01-03 11:35:59 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-04 12:43:10 -0800 |
| commit | 4becf676e0b09b421821b6895251549ec98d4e5d (patch) | |
| tree | 894ffe597aa356454ea45376726f8b43854c99c3 /src | |
| parent | c2e537fef26be6f9995f99e04015d0c1ac9ed5ae (diff) | |
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 <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Tested-by: Robert Hooker <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/clientinfo.c | 5 | ||||
| -rw-r--r-- | src/glx/create_context.c | 2 | ||||
| -rw-r--r-- | src/glx/glxextensions.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/glx/clientinfo.c b/src/glx/clientinfo.c index 429e9a3bfa7..461030fce88 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, diff --git a/src/glx/create_context.c b/src/glx/create_context.c index 11f9340a2e8..714f0e59271 100644 --- a/src/glx/create_context.c +++ b/src/glx/create_context.c @@ -94,7 +94,7 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config, * the protocol error and handle it. Part of handling the error is freeing * the possibly non-NULL value returned by this function. */ -#ifdef XCB_GLX_CREATE_CONTEXT_ATTRIBS_ARB +#ifdef HAVE_XCB_GLX_CREATE_CONTEXT cookie = xcb_glx_create_context_attribs_arb_checked(c, gc->xid, diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c index 0fcd8a9e8b5..86dc7d03d13 100644 --- a/src/glx/glxextensions.c +++ b/src/glx/glxextensions.c @@ -71,7 +71,7 @@ struct extension_info /* *INDENT-OFF* */ static const struct extension_info known_glx_extensions[] = { -#ifdef XCB_GLX_CREATE_CONTEXT_ATTRIBS_ARB +#ifdef HAVE_XCB_GLX_CREATE_CONTEXT { GLX(ARB_create_context), VER(0,0), Y, N, N, N }, { GLX(ARB_create_context_profile), VER(0,0), Y, N, N, N }, #else @@ -85,7 +85,7 @@ static const struct extension_info known_glx_extensions[] = { { GLX(EXT_visual_info), VER(0,0), Y, Y, N, N }, { GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N }, { GLX(EXT_framebuffer_sRGB), VER(0,0), Y, Y, N, N }, -#ifdef XCB_GLX_CREATE_CONTEXT_ATTRIBS_ARB +#ifdef HAVE_XCB_GLX_CREATE_CONTEXT { GLX(EXT_create_context_es2_profile), VER(0,0), Y, N, N, Y }, #else { GLX(EXT_create_context_es2_profile), VER(0,0), N, N, N, N }, |