mesa: fix glsl version mismatch in compat profile

Drivers that only support compat 3.0 were reporting GLSL 1.40
support. This fixes issues with the menu of Dawn of War II.

Fixes: a0c8b49284 "mesa: enable OpenGL 3.1 with ARB_compatibility"

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105807
This commit is contained in:
Timothy Arceri
2018-04-10 21:40:11 +10:00
parent 0babc8e5d6
commit a05faf80c3
+6 -2
View File
@@ -620,8 +620,11 @@ _mesa_compute_version(struct gl_context *ctx)
/* Make sure that the GLSL version lines up with the GL version. In some
* cases it can be too high, e.g. if an extension is missing.
*/
if (_mesa_is_desktop_gl(ctx) && ctx->Version >= 31) {
if (_mesa_is_desktop_gl(ctx)) {
switch (ctx->Version) {
case 30:
ctx->Const.GLSLVersion = 130;
break;
case 31:
ctx->Const.GLSLVersion = 140;
break;
@@ -629,7 +632,8 @@ _mesa_compute_version(struct gl_context *ctx)
ctx->Const.GLSLVersion = 150;
break;
default:
ctx->Const.GLSLVersion = ctx->Version * 10;
if (ctx->Version >= 33)
ctx->Const.GLSLVersion = ctx->Version * 10;
break;
}
}