OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: run validate_ir_tree if GLSL_VALIDATE=1 regardless of the build config

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5746>
This commit is contained in:
Marek Olšák
2020-06-24 02:37:34 -04:00
parent 82caff5bc3
commit 8773d58b05
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/glsl/ir_validate.cpp
View File

@@ -35,6 +35,7 @@
#include "ir.h" #include "ir.h"
#include "ir_hierarchical_visitor.h" #include "ir_hierarchical_visitor.h"
#include "util/debug.h"
#include "util/hash_table.h" #include "util/hash_table.h"
#include "util/macros.h" #include "util/macros.h"
#include "util/set.h" #include "util/set.h"
@@ -1111,7 +1112,6 @@ ir_validate::validate_ir(ir_instruction *ir, void *data)
_mesa_set_add(ir_set, ir); _mesa_set_add(ir_set, ir);
} }
#ifdef DEBUG
static void static void
check_node_type(ir_instruction *ir, void *data) check_node_type(ir_instruction *ir, void *data)
{ {
@@ -1125,7 +1125,6 @@ check_node_type(ir_instruction *ir, void *data)
if (value != NULL) if (value != NULL)
assert(value->type != glsl_type::error_type); assert(value->type != glsl_type::error_type);
} }
#endif
void void
validate_ir_tree(exec_list *instructions) 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 * and it's half composed of assert()s anyway which wouldn't do
* anything. * anything.
*/ */
#ifdef DEBUG #ifndef DEBUG
if (!env_var_as_boolean("GLSL_VALIDATE", false))
return;
#endif
ir_validate v; ir_validate v;
v.run(instructions); v.run(instructions);
@@ -1142,5 +1144,4 @@ validate_ir_tree(exec_list *instructions)
foreach_in_list(ir_instruction, ir, instructions) { foreach_in_list(ir_instruction, ir, instructions) {
visit_tree(ir, check_node_type, NULL); visit_tree(ir, check_node_type, NULL);
} }
#endif
} }