diff options
| author | Marek Olšák <[email protected]> | 2014-09-12 16:30:50 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-09-24 14:48:01 +0200 |
| commit | 10ffd98c34c2d730a50de21bc7b5c6fa483fbf9d (patch) | |
| tree | d2b8ebc804a579a3a9534b788b18631a2b6ef281 | |
| parent | a3e9582f09249ad27716ba82c7dfcee685b65d51 (diff) | |
mesa: don't set ES versions to GLSLVersion in _mesa_init_constants
No place in Mesa expects an ES version there.
Drivers don't even set it like this.
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/main/context.c | 12 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 682b9c79718..53fb9c6e5f9 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -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; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 553a216672a..7c237bd1ba9 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -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 |