OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Initialize OpenGL version to 1.0

Browse Source 
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>
This commit is contained in:
Rico Schüller
2013-09-01 21:30:19 +02:00
committed by Ian Romanick
parent 4e861ac4a1
commit 8b302e1635
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glx/dri2_glx.c
View File

@@ -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;

14
src/glx/dri_common.c
View File

@@ -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;

10
src/glx/drisw_glx.c
View File

@@ -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;