summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-08-06 19:24:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-08-06 19:24:02 +0000
commitb5a41d6050a06204f5450f63a98862e70585b7f9 (patch)
treec44f8fca5866df7a239717c71e98884a271ebd5d
parent2c50b922d615b5f3c6f4cb2e399e1bd6fec1e278 (diff)
prep for OpenGL 1.5
-rw-r--r--src/mesa/main/extensions.c1
-rw-r--r--src/mesa/main/get.c11
2 files changed, 11 insertions, 1 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 95c680c9cad..0edf3a490a2 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -299,6 +299,7 @@ _mesa_enable_1_5_extensions(GLcontext *ctx)
ctx->Extensions.ARB_occlusion_query = GL_TRUE;
ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;
ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+ ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
}
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 3e02c99c48c..89281d22465 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -6379,6 +6379,7 @@ _mesa_GetString( GLenum name )
static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING;
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;
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
@@ -6419,7 +6420,15 @@ _mesa_GetString( GLenum name )
ctx->Extensions.EXT_secondary_color &&
ctx->Extensions.EXT_stencil_wrap &&
ctx->Extensions.SGIS_generate_mipmap) {
- return (const GLubyte *) version_1_4;
+ if (ctx->Extensions.ARB_occlusion_query &&
+ ctx->Extensions.ARB_vertex_buffer_object &&
+ ctx->Extensions.ARB_texture_non_power_of_two &&
+ ctx->Extensions.EXT_shadow_funcs) {
+ return (const GLubyte *) version_1_5;
+ }
+ else {
+ return (const GLubyte *) version_1_4;
+ }
}
else {
return (const GLubyte *) version_1_3;