Mesa (glsl2): glsl2: Check that nodes in a valid tree aren't error-type.

Eric Anholt anholt at kemper.freedesktop.org
Wed Jul 21 00:30:27 UTC 2010


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

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jul 20 17:18:57 2010 -0700

glsl2: Check that nodes in a valid tree aren't error-type.

We're good at propagating error types around, but finding when the
first one was triggered can be painful if we aren't paying attention.

---

 src/glsl/ir_validate.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 8a56795..c05edf2 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -37,7 +37,7 @@
 #include "ir.h"
 #include "ir_hierarchical_visitor.h"
 #include "hash_table.h"
-
+#include "glsl_types.h"
 
 class ir_validate : public ir_hierarchical_visitor {
 public:
@@ -179,6 +179,7 @@ check_node_type(ir_instruction *ir, void *data)
       printf("Instruction node with unset type\n");
       ir->print(); printf("\n");
    }
+   assert(ir->type != glsl_type::error_type);
 }
 
 void




More information about the mesa-commit mailing list