diff options
| author | Eric Anholt <eric@anholt.net> | 2011-04-09 12:54:34 -1000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-04-13 15:48:26 -0700 |
| commit | 175829f1a8ab0df7594131cc569462e45c1974ec (patch) | |
| tree | 023e2b561a2f4f0b1c75a3e35e3923eb4bc5226f | |
| parent | 9e04b190b5f59c5b375645f5756a6edd98a7f90c (diff) | |
| download | external_mesa3d-175829f1a8ab0df7594131cc569462e45c1974ec.zip external_mesa3d-175829f1a8ab0df7594131cc569462e45c1974ec.tar.gz external_mesa3d-175829f1a8ab0df7594131cc569462e45c1974ec.tar.bz2 | |
glsl: When we've emitted a semantic error for ==, return a bool constant.
This prevents later errors (including an assertion failure) from
cascading the failure.
Fixes invalid-equality-04.vert.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33303
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chad Versace <chad.versace@intel.com>
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 108c7c3..ea20eba 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -1073,10 +1073,14 @@ ast_expression::hir(exec_list *instructions, error_emitted = true; } - result = do_comparison(ctx, operations[this->oper], op[0], op[1]); - type = glsl_type::bool_type; + if (error_emitted) { + result = new(ctx) ir_constant(false); + } else { + result = do_comparison(ctx, operations[this->oper], op[0], op[1]); + assert(result->type == glsl_type::bool_type); + type = glsl_type::bool_type; + } - assert(error_emitted || (result->type == glsl_type::bool_type)); break; case ast_bit_and: |