Mesa (master): glsl: add component to ast_type_qualifier::validate_flags

Timothy Arceri tarceri at kemper.freedesktop.org
Sat Jul 30 23:47:42 UTC 2016


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

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Sat Jul 30 14:53:20 2016 +1000

glsl: add component to ast_type_qualifier::validate_flags

This was added with ARB_enhanced_layouts.

V2: Add an extra format specifier for the new qualifier.

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

---

 src/compiler/glsl/ast_type.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index d34d641..1f8fb9c 100644
--- a/src/compiler/glsl/ast_type.cpp
+++ b/src/compiler/glsl/ast_type.cpp
@@ -612,7 +612,7 @@ ast_type_qualifier::validate_flags(YYLTYPE *loc,
                     "%s:"
                     "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
                     "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s"
-                    "%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+                    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
                     message,
                     bad.flags.q.invariant ? " invariant" : "",
                     bad.flags.q.precise ? " precise" : "",
@@ -633,6 +633,7 @@ ast_type_qualifier::validate_flags(YYLTYPE *loc,
                     bad.flags.q.origin_upper_left ? " origin_upper_left" : "",
                     bad.flags.q.pixel_center_integer ? " pixel_center_integer" : "",
                     bad.flags.q.explicit_align ? " align" : "",
+                    bad.flags.q.explicit_component ? " component" : "",
                     bad.flags.q.explicit_location ? " location" : "",
                     bad.flags.q.explicit_index ? " index" : "",
                     bad.flags.q.explicit_binding ? " binding" : "",




More information about the mesa-commit mailing list