Mesa (7.10): glsl: Ensure that all GLSL versions are supported in the stand-alone compiler
Ian Romanick
idr at kemper.freedesktop.org
Tue Mar 1 00:01:36 UTC 2011
Module: Mesa
Branch: 7.10
Commit: a527411469279ad407ac2f268fd4caedbaf6aeb0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a527411469279ad407ac2f268fd4caedbaf6aeb0
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Jan 31 14:52:27 2011 -0800
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)
---
src/glsl/main.cpp | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 83a523a..1820e19 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;
More information about the mesa-commit
mailing list