summaryrefslogtreecommitdiff
path: root/src/mesa/main/getstring.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 15:18:17 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-11-03 15:18:17 +0000
commit61fd687c74610a5b3db5e9f3adb3ee2e9a5a6014 (patch)
tree83da0bbd63ddbc37acf7351771e882e3223bd572 /src/mesa/main/getstring.c
parent029d18cd3d79ff956c50b3486078d968d15bf0fb (diff)
Minor changes to get ready for OpenGL 2.1.
Diffstat (limited to 'src/mesa/main/getstring.c')
-rw-r--r--src/mesa/main/getstring.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index f68bbf2ff3..f033ddc895 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -55,6 +55,7 @@ _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;
+ static const char *version_2_1 = "1.5 Mesa " MESA_VERSION_STRING;
#if FEATURE_ARB_shading_language_100
static const char *sl_version_110 = "1.10 Mesa " MESA_VERSION_STRING;
@@ -114,7 +115,14 @@ _mesa_GetString( GLenum name )
ctx->Extensions.ARB_vertex_shader &&
ctx->Extensions.ARB_fragment_shader &&
ctx->Extensions.ARB_texture_non_power_of_two) {
- return (const GLubyte *) version_2_0;
+ if (ctx->Extensions.ARB_shading_language_120 &&
+ ctx->Extensions.EXT_pixel_buffer_object &&
+ ctx->Extensions.EXT_texture_sRGB) {
+ return (const GLubyte *) version_2_1;
+ }
+ else {
+ return (const GLubyte *) version_2_0;
+ }
}
else {
return (const GLubyte *) version_1_5;