diff options
| author | Eric Anholt <eric@anholt.net> | 2012-07-04 11:58:40 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-07-12 12:29:12 -0700 |
| commit | 6882381a2efbdf06b7002d11468c94b9964c2bc8 (patch) | |
| tree | 05e78c7dc8cb8783d1a471ef207c9bf9a72591c1 /src/glx/clientinfo.c | |
| parent | f92873be2c7fcb07154282bd0e418a4c88b6507e (diff) | |
| download | external_mesa3d-6882381a2efbdf06b7002d11468c94b9964c2bc8.zip external_mesa3d-6882381a2efbdf06b7002d11468c94b9964c2bc8.tar.gz external_mesa3d-6882381a2efbdf06b7002d11468c94b9964c2bc8.tar.bz2 | |
mesa: Require current libxcb.
Without that, people with buggy apps that looked at just the server
string for GLX_ARB_create_context would call this function that just
threw an error when you tried to make a context. Google shows plenty
of complaints about this.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glx/clientinfo.c')
| -rw-r--r-- | src/glx/clientinfo.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/glx/clientinfo.c b/src/glx/clientinfo.c index 97d43ce..429e9a3 100644 --- a/src/glx/clientinfo.c +++ b/src/glx/clientinfo.c @@ -39,7 +39,6 @@ __glX_send_client_info(struct glx_display *glx_dpy) Bool any_screen_has_ARB_create_context = False; Bool any_screen_has_ARB_create_context_profile = False; unsigned i; -#ifdef HAVE_XCB_GLX_CREATE_CONTEXT static const uint32_t gl_versions[] = { 1, 4, }; @@ -48,7 +47,6 @@ __glX_send_client_info(struct glx_display *glx_dpy) }; static const char glx_extensions[] = "GLX_ARB_create_context GLX_ARB_create_context_profile"; -#endif /* There are three possible flavors of the client info structure that the * client could send to the server. The version sent depends on the @@ -125,7 +123,6 @@ __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, @@ -148,9 +145,7 @@ __glX_send_client_info(struct glx_display *glx_dpy) gl_versions, gl_extension_string, glx_extensions); - } else -#endif - { + } else { xcb_glx_client_info(c, GLX_MAJOR_VERSION, GLX_MINOR_VERSION, gl_extension_length, |