Return GLSL version string (1.10).

1 files changed, 11 insertions, 3 deletions

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 5188a79c951..423466aef33 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -54,7 +54,8 @@ _mesa_GetString( GLenum name )
    static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING;
    static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING;
    static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING;
-   static const char *version_2_0 = "1.5 Mesa " MESA_VERSION_STRING;/*XXX FIX*/
+   static const char *version_2_0 = "1.5 Mesa " MESA_VERSION_STRING;/*XXX FIX*/

+   static const char *sl_version_110 = "1.10 Mesa " MESA_VERSION_STRING;
 
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
@@ -125,7 +126,13 @@ _mesa_GetString( GLenum name )
       case GL_EXTENSIONS:
          if (!ctx->Extensions.String)
             ctx->Extensions.String = _mesa_make_extension_string(ctx);
-         return (const GLubyte *) ctx->Extensions.String;
+         return (const GLubyte *) ctx->Extensions.String;

+#if FEATURE_ARB_shading_language_100

+      case GL_SHADING_LANGUAGE_VERSION_ARB:

+         if (ctx->Extensions.ARB_shading_language_100)

+            return (const GLubyte *) sl_version_110;

+         goto error;

+#endif
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
     FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
       case GL_PROGRAM_ERROR_STRING_NV:
@@ -136,7 +143,8 @@ _mesa_GetString( GLenum name )
             return (const GLubyte *) ctx->Program.ErrorString;
          }
          /* FALL-THROUGH */
-#endif
+#endif

+      error:
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
          return (const GLubyte *) 0;