Mesa (master): glsl: Ensure that all GLSL versions are supported in the stand-alone compiler

Ian Romanick idr at kemper.freedesktop.org
Mon Jan 31 23:33:18 UTC 2011


Module: Mesa
Branch: master
Commit: e5e34ab18eeaffa465094f6281dfe293b84376db
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5e34ab18eeaffa465094f6281dfe293b84376db

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

---

 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 b4c7f96..6f05529 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -72,12 +72,18 @@ 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_draw_instanced = 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