mesa: Branch 'master'

[Brian Paul]

 src/mesa/main/config.h     |    1 +
 src/mesa/main/extensions.c |    3 +++
 2 files changed, 4 insertions(+)

New commits:
diff-tree af807a4696866a4ee08bb2a4e95b9c02011db530 (from 5c0c60a13cb95032a49aa77ae7275387a351a057)
Author: Brian <brian at nostromo.localnet.net>
Date:   Sun Apr 8 21:48:19 2007 -0600

    enable GLSL 1.20

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 8ea2d2c..a4de3bd 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -300,6 +300,7 @@
 #define FEATURE_ARB_fragment_shader _HAVE_FULL_GL
 #define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
 #define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
+#define FEATURE_ARB_shading_language_120 FEATURE_ARB_shader_objects
 
 #define FEATURE_EXT_framebuffer_blit _HAVE_FULL_GL
 #define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index b61cb82..4e44c5b 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -200,6 +200,9 @@ _mesa_enable_sw_extensions(GLcontext *ct
 #if FEATURE_ARB_shading_language_100
    ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
 #endif
+#if FEATURE_ARB_shading_language_120
+   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
+#endif
    ctx->Extensions.ARB_shadow = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
    ctx->Extensions.ARB_texture_cube_map = GL_TRUE;