diff options
| author | Michal Krol <[email protected]> | 2006-04-25 10:11:59 +0000 |
|---|---|---|
| committer | Michal Krol <[email protected]> | 2006-04-25 10:11:59 +0000 |
| commit | 6acf1e93a291511cfb20b0e2aeda6e71ceb62a62 (patch) | |
| tree | 9c959b0fc2c5e6f49f5625813294d2048d48959c /src/mesa/main/getstring.c | |
| parent | cb0ae25a4efd85128f47aa30b772abb7245d53f6 (diff) | |
Remove carriage returns.
Diffstat (limited to 'src/mesa/main/getstring.c')
| -rw-r--r-- | src/mesa/main/getstring.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 423466aef33..b6eed5810cd 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -54,7 +54,7 @@ _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); @@ -126,12 +126,12 @@ _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;
-#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;
+ 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 @@ -143,7 +143,7 @@ _mesa_GetString( GLenum name ) return (const GLubyte *) ctx->Program.ErrorString; } /* FALL-THROUGH */ -#endif
+#endif error: default: _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" ); |