summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2013-11-13 14:27:11 -0800
committerIan Romanick <[email protected]>2013-12-20 16:43:08 -0800
commit79f268978d2341205f03738a2bc981838c09d920 (patch)
treee950f546ed2ecc9ed6daad111238d38b62a5bbda /src/mesa/main
parent49493224623d4a559337a5079532015f7db58e4a (diff)
mesa: It is not possible to have GLSL < 1.20
This hasn't been possible for a long time. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/getstring.c2
-rw-r--r--src/mesa/main/version.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index d8189115adc..b66e24788a4 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 55411faf8c5..00eeca764cb 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 &&