Mesa (master): glsl: replace index layout min boundary check
Timothy Arceri
tarceri at kemper.freedesktop.org
Fri Nov 20 20:30:28 UTC 2015
Module: Mesa
Branch: master
Commit: efa34e4a1d09c6f140fba7ff339a989ea079e212
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efa34e4a1d09c6f140fba7ff339a989ea079e212
Author: Timothy Arceri <timothy.arceri at collabora.com>
Date: Sat Nov 14 13:09:46 2015 +1100
glsl: replace index layout min boundary check
Use new helper that will in a later patch allow for
compile time constants.
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/glsl/ast_to_hir.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index f0f2d52..fde3df5 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2804,7 +2804,10 @@ apply_explicit_location(const struct ast_type_qualifier *qual,
break;
}
- if (qual->flags.q.explicit_index) {
+ unsigned qual_index;
+ if (qual->flags.q.explicit_index &&
+ process_qualifier_constant(state, loc, "index", qual->index,
+ &qual_index)) {
/* From the GLSL 4.30 specification, section 4.4.2 (Output
* Layout Qualifiers):
*
@@ -2814,12 +2817,12 @@ apply_explicit_location(const struct ast_type_qualifier *qual,
* Older specifications don't mandate a behavior; we take
* this as a clarification and always generate the error.
*/
- if (qual->index < 0 || qual->index > 1) {
+ if (qual_index > 1) {
_mesa_glsl_error(loc, state,
"explicit index may only be 0 or 1");
} else {
var->data.explicit_index = true;
- var->data.index = qual->index;
+ var->data.index = qual_index;
}
}
}
More information about the mesa-commit
mailing list