From 8b302e1635534bfc6ed3ad671f2428470b3a765d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rico=20Sch=C3=BCller?= Date: Sun, 1 Sep 2013 21:30:19 +0200 Subject: [PATCH] glx: Initialize OpenGL version to 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The old code in dri2_glx suffered from a typographical error that caused the default version to be 2.1 instead of 1.2 (minimum required by the Linux OpenGL ABI). drisw_glx had a similar error resulting in a default version of 0.1. Some driver/card combinations (r200/RV280, i915/915G) don't support OpenGL 2.1. These create in some corner cases an indirect context instead of a direct context when calling glXCreateContextAttribsARB(). This happens because of a bad default value. To avoid this, just used the default value specified by the GLX_ARB_create_context specification: "The default values for GLX_CONTEXT_MAJOR_VERSION_ARB and GLX_CONTEXT_MINOR_VERSION_ARB are 1 and 0 respectively. In this case, implementations will typically return the most recent version of OpenGL they support which is backwards compatible with OpenGL 1.0 (e.g. 3.0, 3.1 + GL_ARB_compatibility, or 3.2 compatibility profile)" Refactor all the default value setting to dri2_convert_glx_attribs, and make sure the correct defaults are set in that one place. Signed-off-by: Rico Schüller Reviewed-by: Ian Romanick Bugzilla http://bugs.winehq.org/show_bug.cgi?id=34238 Cc: "9.1 9.2" --- src/glx/dri2_glx.c | 10 +++++----- src/glx/dri_common.c | 14 +++++++------- src/glx/drisw_glx.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 54fc21cdfcc..07138fb11f8 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -260,12 +260,12 @@ dri2_create_context_attribs(struct glx_screen *base, __GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) config_base; __DRIcontext *shared = NULL; - uint32_t minor_ver = 1; - uint32_t major_ver = 2; - uint32_t renderType = GLX_RGBA_TYPE; - uint32_t flags = 0; + uint32_t minor_ver; + uint32_t major_ver; + uint32_t renderType; + uint32_t flags; unsigned api; - int reset = __DRI_CTX_RESET_NO_NOTIFICATION; + int reset; uint32_t ctx_attribs[2 * 5]; unsigned num_ctx_attribs = 0; diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index b2a3117c5ac..5f199e9fde4 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -470,8 +470,14 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, bool got_profile = false; uint32_t profile; + *major_ver = 1; + *minor_ver = 0; + *render_type = GLX_RGBA_TYPE; + *reset = __DRI_CTX_RESET_NO_NOTIFICATION; + *flags = 0; + *api = __DRI_API_OPENGL; + if (num_attribs == 0) { - *api = __DRI_API_OPENGL; return true; } @@ -482,11 +488,6 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, return false; } - *major_ver = 1; - *minor_ver = 0; - *render_type = GLX_RGBA_TYPE; - *reset = __DRI_CTX_RESET_NO_NOTIFICATION; - for (i = 0; i < num_attribs; i++) { switch (attribs[i * 2]) { case GLX_CONTEXT_MAJOR_VERSION_ARB: @@ -526,7 +527,6 @@ dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, } } - *api = __DRI_API_OPENGL; if (!got_profile) { if (*major_ver > 3 || (*major_ver == 3 && *minor_ver >= 2)) *api = __DRI_API_OPENGL_CORE; diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 0583cd15ab5..393be205d88 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -433,12 +433,12 @@ drisw_create_context_attribs(struct glx_screen *base, struct drisw_screen *psc = (struct drisw_screen *) base; __DRIcontext *shared = NULL; - uint32_t minor_ver = 1; - uint32_t major_ver = 0; - uint32_t renderType = GLX_RGBA_TYPE; - uint32_t flags = 0; + uint32_t minor_ver; + uint32_t major_ver; + uint32_t renderType; + uint32_t flags; unsigned api; - int reset = __DRI_CTX_RESET_NO_NOTIFICATION; + int reset; uint32_t ctx_attribs[2 * 4]; unsigned num_ctx_attribs = 0; -- 2.30.2