Mesa (glsl2): glsl2: Perform some semantic checking of ARB_fcc layout qualifiers

Eric Anholt anholt at kemper.freedesktop.org
Wed Jul 28 22:01:09 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 8d8469eb2ade4fd48188403351a38f740987fb80
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d8469eb2ade4fd48188403351a38f740987fb80

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jun 30 17:48:09 2010 -0700

glsl2: Perform some semantic checking of ARB_fcc layout qualifiers

The rest cannot be handled until built-in variables (i.e.,
gl_FragCoord) can be redeclared to add qualifiers.

---

 src/glsl/ast_to_hir.cpp |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 98ea789..d82cf33 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1542,6 +1542,19 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
    else
       var->interpolation = ir_var_smooth;
 
+   /* FINISHME: Apply the fragment coord convetion layout qualifiers.
+    */
+   if ((qual->origin_upper_left || qual->pixel_center_integer)
+       && (strcmp(var->name, "gl_FragCoord") != 0)) {
+      const char *const qual_string = (qual->origin_upper_left)
+	 ? "origin_upper_left" : "pixel_center_integer";
+
+      _mesa_glsl_error(loc, state,
+		       "layout qualifier `%s' can only be applied to "
+		       "fragment shader input `gl_FragCoord'",
+		       qual_string);
+   }
+
    if (var->type->is_array() && (state->language_version >= 120)) {
       var->array_lvalue = true;
    }




More information about the mesa-commit mailing list