fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 07:58:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix up GLSL version when computing GL version

Browse source 
In some situations it is convenient for a driver to expose a higher GLSL
version while some extensions are still incomplete. However in that
situation, it would report a GLSL version that was higher than the GL
version. Avoid that situation by limiting the GLSL version to the GL
version.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ilia Mirkin 2015-04-27 14:00:44 -04:00
parent 7c3d1c132e
commit dfb0b36e8f
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mesa/main/version.c
View file

@ -483,6 +483,23 @@ _mesa_compute_version(struct gl_context *ctx)
ctx->Version = _mesa_get_version(&ctx->Extensions, &ctx->Const, ctx->API);
/* 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 (ctx->API == API_OPENGL_CORE) {
switch (ctx->Version) {
case 31:
ctx->Const.GLSLVersion = 140;
break;
case 32:
ctx->Const.GLSLVersion = 150;
break;
default:
ctx->Const.GLSLVersion = ctx->Version * 10;
break;
}
}
switch (ctx->API) {
case API_OPENGL_COMPAT:
case API_OPENGL_CORE: