summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-01-31 14:52:27 -0800
committerIan Romanick <ian.d.romanick@intel.com>2011-02-28 14:33:19 -0800
commita527411469279ad407ac2f268fd4caedbaf6aeb0 (patch)
tree46981a68295ddabdce59c687f61bba277b1178b0
parentf9e01af6c3071669c2d52ddaeea98c98b8b7e10c (diff)
glsl: Ensure that all GLSL versions are supported in the stand-alone compiler
NOTE: This is a candidate for the 7.9 and 7.10 branches (cherry picked from commit e5e34ab18eeaffa465094f6281dfe293b84376db)
-rw-r--r--src/glsl/main.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 83a523affd9..1820e191447 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -77,11 +77,17 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->API = api;
+ ctx->Extensions.ARB_ES2_compatibility = GL_TRUE;
ctx->Extensions.ARB_draw_buffers = GL_TRUE;
ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
ctx->Extensions.EXT_texture_array = GL_TRUE;
ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+ /* GLSL 1.30 isn't fully supported, but we need to advertise 1.30 so that
+ * the built-in functions for 1.30 can be built.
+ */
+ ctx->Const.GLSLVersion = 130;
+
/* 1.10 minimums. */
ctx->Const.MaxLights = 8;
ctx->Const.MaxClipPlanes = 8;