summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-08-03 11:43:25 -0700
committerEric Anholt <eric@anholt.net>2010-08-03 11:47:02 -0700
commitc22dee721695402d9f2678c100d2fff5c0c3f21f (patch)
tree585370714e40e6ee9a3634b2a207030f3035e5c3
parent900ab2f564018856133c19b68713a6dfd206c184 (diff)
glsl2: Fix ir_validate validating null variable names.
An unnamed variable in a prototype will have a NULL ->name, so don't worry about storage then. Fixes: CorrectFunction1.vert CorrectParse1.frag
-rw-r--r--src/glsl/ir_validate.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 712e1376fa..89bcd1c481 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -313,7 +313,8 @@ ir_validate::visit(ir_variable *ir)
* in the ir_dereference_variable handler to ensure that a variable is
* declared before it is dereferenced.
*/
- assert(talloc_parent(ir->name) == ir);
+ if (ir->name)
+ assert(talloc_parent(ir->name) == ir);
hash_table_insert(ht, ir, ir);
return visit_continue;