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/glxextensions.c | |
| parent | c2e537fef26be6f9995f99e04015d0c1ac9ed5ae (diff) | |
| download | mesa-4becf676e0b09b421821b6895251549ec98d4e5d.tar.gz | |
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/glxextensions.c')
| -rw-r--r-- | src/glx/glxextensions.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 }, |