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

mesa: don't set ES versions to GLSLVersion in _mesa_init_constants

Browse source 
No place in Mesa expects an ES version there.
Drivers don't even set it like this.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2014-09-12 16:30:50 +02:00
parent a3e9582f09
commit 10ffd98c34
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/main/context.c
View file

@ -642,16 +642,8 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api)
consts->MaxGeometryTotalOutputComponents = MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS;
/* Shading language version */
if (api == API_OPENGL_COMPAT || api == API_OPENGL_CORE) {
consts->GLSLVersion = 120;
_mesa_override_glsl_version(consts);
}
else if (api == API_OPENGLES2) {
consts->GLSLVersion = 100;
}
else if (api == API_OPENGLES) {
consts->GLSLVersion = 0; /* GLSL not supported */
}
consts->GLSLVersion = 120;
_mesa_override_glsl_version(consts);
/* GL_ARB_framebuffer_object */
consts->MaxSamples = 0;

2
src/mesa/main/mtypes.h
View file

@ -3452,7 +3452,7 @@ struct gl_constants
GLuint MaxGeometryOutputVertices;
GLuint MaxGeometryTotalOutputComponents;
GLuint GLSLVersion; /**< GLSL version supported (ex: 120 = 1.20) */
GLuint GLSLVersion; /**< Desktop GLSL version supported (ex: 120 = 1.20) */
/**
* Changes default GLSL extension behavior from "error" to "warn". It's out