From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 13 Nov 2013 22:27:11 +0000 (-0800)
Subject: mesa: It is not possible to have GLSL < 1.20
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79f268978d2341205f03738a2bc981838c09d920;p=mesa.git

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>
---

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 &&