summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/getstring.c
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2006-08-01 20:07:31 +0000
committerMichal Krol <[email protected]>2006-08-01 20:07:31 +0000
commit365582dd6f632aafbc1c817aa57926d679bb2efc (patch)
tree75f3184e471793c06cd16ef1bdd3e10629f2a28a /src/mesa/main/getstring.c
parentcc738e004f083566f3e1723f72623ef9875f72ec (diff)
Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492.
Diffstat (limited to 'src/mesa/main/getstring.c')
-rw-r--r--src/mesa/main/getstring.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index a741f8310be..fba8e1634f4 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -55,7 +55,10 @@ _mesa_GetString( GLenum name )
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*/
+
+#if FEATURE_ARB_shading_language_100
static const char *sl_version_110 = "1.10 Mesa " MESA_VERSION_STRING;
+#endif
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
@@ -144,7 +147,9 @@ _mesa_GetString( GLenum name )
}
/* FALL-THROUGH */
#endif
+#if FEATURE_ARB_shading_language_100
error:
+#endif
default:
_mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
return (const GLubyte *) 0;