Mesa (master): glsl: Let the builtin compiler process GLSL 1.40 shaders.

Eric Anholt anholt at kemper.freedesktop.org
Thu Mar 15 23:56:58 UTC 2012


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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Mar 12 15:51:54 2012 -0700

glsl: Let the builtin compiler process GLSL 1.40 shaders.

This is required to put the new 1.40 builtins in place, since they
require new types.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/main.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index e174224..d43bf1a 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -35,10 +35,10 @@ initialize_context(struct gl_context *ctx, gl_api api)
 {
    initialize_context_to_defaults(ctx, api);
 
-   /* 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.
+   /* The standalone compiler needs to claim support for almost
+    * everything in order to compile the built-in functions.
     */
-   ctx->Const.GLSLVersion = 130;
+   ctx->Const.GLSLVersion = 140;
 
    ctx->Const.MaxClipPlanes = 8;
    ctx->Const.MaxDrawBuffers = 2;




More information about the mesa-commit mailing list