summaryrefslogtreecommitdiff
path: root/src/mesa/shader
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-08-04 11:14:12 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-08-04 17:14:48 -0600
commit1028458354773d748278d7719f695eb4c2ffc090 (patch)
tree2d21cebd0f80d90ef6a9e90ca4c358e60887cf37 /src/mesa/shader
parent901c4db2ed7b98d2026fb9f0374a48eca9a8019f (diff)
mesa: glsl: check that rhs of const var initializer is also const
Diffstat (limited to 'src/mesa/shader')
-rw-r--r--src/mesa/shader/slang/slang_codegen.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 70feed7326..691d10b8f1 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2622,6 +2622,32 @@ _slang_gen_return(slang_assemble_ctx * A, slang_operation *oper)
/**
+ * Determine if the given operation/expression is const-valued.
+ */
+static GLboolean
+_slang_is_constant_expr(const slang_operation *oper)
+{
+ slang_variable *var;
+ GLuint i;
+
+ switch (oper->type) {
+ case SLANG_OPER_IDENTIFIER:
+ var = _slang_locate_variable(oper->locals, oper->a_id, GL_TRUE);
+ if (var && var->type.qualifier == SLANG_QUAL_CONST)
+ return GL_TRUE;
+ return GL_FALSE;
+ default:
+ for (i = 0; i < oper->num_children; i++) {
+ if (!_slang_is_constant_expr(&oper->children[i]))
+ return GL_FALSE;
+ }
+ return GL_TRUE;
+ }
+}
+
+
+
+/**
* Generate IR tree for a variable declaration.
*/
static slang_ir_node *
@@ -2671,6 +2697,18 @@ _slang_gen_declaration(slang_assemble_ctx *A, slang_operation *oper)
slang_info_log_error(A->log, "undefined variable '%s'", varName);
return NULL;
}
+
+ if (v->type.qualifier == SLANG_QUAL_CONST) {
+ /* if the variable is const, the initializer must be a const
+ * expression as well.
+ */
+ if (!_slang_is_constant_expr(v->initializer)) {
+ slang_info_log_error(A->log,
+ "initializer for %s not constant", varName);
+ return NULL;
+ }
+ }
+
#if 0
/* XXX make copy of this initializer? */
{