diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-11-13 14:27:11 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-12-20 16:43:08 -0800 |
| commit | 79f268978d2341205f03738a2bc981838c09d920 (patch) | |
| tree | e950f546ed2ecc9ed6daad111238d38b62a5bbda | |
| parent | 49493224623d4a559337a5079532015f7db58e4a (diff) | |
| download | external_mesa3d-79f268978d2341205f03738a2bc981838c09d920.zip external_mesa3d-79f268978d2341205f03738a2bc981838c09d920.tar.gz external_mesa3d-79f268978d2341205f03738a2bc981838c09d920.tar.bz2 | |
mesa: It is not possible to have GLSL < 1.20
This hasn't been possible for a long time.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/mesa/main/getstring.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index d818911..b66e247 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -42,8 +42,6 @@ shading_language_version(struct gl_context *ctx) case API_OPENGL_COMPAT: case API_OPENGL_CORE: switch (ctx->Const.GLSLVersion) { - case 110: - return (const GLubyte *) "1.10"; case 120: return (const GLubyte *) "1.20"; case 130: diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 55411fa..00eeca7 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -224,7 +224,6 @@ compute_version(struct gl_context *ctx) (ctx->Extensions.EXT_stencil_two_side || ctx->Extensions.ATI_separate_stencil)); const GLboolean ver_2_1 = (ver_2_0 && - ctx->Const.GLSLVersion >= 120 && ctx->Extensions.EXT_pixel_buffer_object && ctx->Extensions.EXT_texture_sRGB); const GLboolean ver_3_0 = (ver_2_1 && |