prep for OpenGL 1.5

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 95c680c9cad10703a8b454c7b78805609ec0e68b..0edf3a490a244b84b6cf9f2837000178baa1c27e 100644 (file)
--- 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 3e02c99c48c3981821a5e3ab754478bf784712cf..89281d22465225d049cff6c2d4c00858281b33d2 100644 (file)
--- 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;