diff options
| author | Rico Schüller <kgbricola@web.de> | 2013-09-01 21:30:19 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-09-04 16:07:21 -0700 |
| commit | 8b302e1635534bfc6ed3ad671f2428470b3a765d (patch) | |
| tree | e04e372080e468ad90bbb4d22528ec1507da3af3 /src/glx/dri2_glx.c | |
| parent | 4e861ac4a1f1bdbd28f66e3f15eb45aa45a47bad (diff) | |
glx: Initialize OpenGL version to 1.0
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 <kgbricola@web.de>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla http://bugs.winehq.org/show_bug.cgi?id=34238
Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/glx/dri2_glx.c')
| -rw-r--r-- | src/glx/dri2_glx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 54fc21cdfc..07138fb11f 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; |