diff options
| author | Marek Olšák <[email protected]> | 2020-06-24 02:37:34 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-07-07 22:02:06 -0400 |
| commit | 8773d58b056e2299c5c1d93543a4cc8512fcccf3 (patch) | |
| tree | 6c06aea8f18a8ecc6d1e680d866fdc11521b80ce | |
| parent | 82caff5bc3612bb7f8498f8c194256276d9bfe7c (diff) | |
glsl: run validate_ir_tree if GLSL_VALIDATE=1 regardless of the build config
Reviewed-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5746>
| -rw-r--r-- | src/compiler/glsl/ir_validate.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/compiler/glsl/ir_validate.cpp b/src/compiler/glsl/ir_validate.cpp index cba7d8c6f08..64e46991753 100644 --- a/src/compiler/glsl/ir_validate.cpp +++ b/src/compiler/glsl/ir_validate.cpp @@ -35,6 +35,7 @@ #include "ir.h" #include "ir_hierarchical_visitor.h" +#include "util/debug.h" #include "util/hash_table.h" #include "util/macros.h" #include "util/set.h" @@ -1111,7 +1112,6 @@ ir_validate::validate_ir(ir_instruction *ir, void *data) _mesa_set_add(ir_set, ir); } -#ifdef DEBUG static void check_node_type(ir_instruction *ir, void *data) { @@ -1125,7 +1125,6 @@ check_node_type(ir_instruction *ir, void *data) if (value != NULL) assert(value->type != glsl_type::error_type); } -#endif void validate_ir_tree(exec_list *instructions) @@ -1134,7 +1133,10 @@ validate_ir_tree(exec_list *instructions) * and it's half composed of assert()s anyway which wouldn't do * anything. */ -#ifdef DEBUG +#ifndef DEBUG + if (!env_var_as_boolean("GLSL_VALIDATE", false)) + return; +#endif ir_validate v; v.run(instructions); @@ -1142,5 +1144,4 @@ validate_ir_tree(exec_list *instructions) foreach_in_list(ir_instruction, ir, instructions) { visit_tree(ir, check_node_type, NULL); } -#endif } |