Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / src / mesa / main / getstring.c

diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 54db5794bf64becfa16a20d56d8b256ba8a982f3..5e4fcd599c39c7fbe230303de2d1da5f353e0c31 100644 (file)
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -31,7 +31,7 @@
 #include "extensions.h"
 
 static const GLubyte *
-shading_laguage_version(GLcontext *ctx)
+shading_language_version(GLcontext *ctx)
 {
    switch (ctx->API) {
 #if FEATURE_ARB_shading_language_100
@@ -95,12 +95,10 @@ _mesa_GetString( GLenum name )
       case GL_VERSION:
          return (const GLubyte *) ctx->VersionString;
       case GL_EXTENSIONS:
-         if (!ctx->Extensions.String)
-            ctx->Extensions.String = _mesa_make_extension_string(ctx);
          return (const GLubyte *) ctx->Extensions.String;
 #if FEATURE_ARB_shading_language_100 || FEATURE_ES2
       case GL_SHADING_LANGUAGE_VERSION:
-        return shading_laguage_version(ctx);
+        return shading_language_version(ctx);
 #endif
 #if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
     FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program