diff options
| author | Ian Romanick <[email protected]> | 2011-12-23 17:16:43 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-04 12:43:10 -0800 |
| commit | 39464489510270bbe472d11f7614c04ce1b6ae33 (patch) | |
| tree | fc372173e86943e513a8e0408a3e99016e31e045 /src | |
| parent | 4becf676e0b09b421821b6895251549ec98d4e5d (diff) | |
glsl: Don't use base type for bit-not when there's an error
Other parts of the compiler assume that expressions will have
well-formed types or the error type. Just using the type of the thing
being operated on can cause expressions like ~3.14 or ~false to not
have a well-formed type. This could then result in an assertion
failure in the context epxression handler.
If there is an error processing the expression, set the type of the IR
expression to error.
Fixes piglit's bit-not-0[789].frag tests.
NOTE: This is a candidate for the 7.11 branch.
Signed-off-by: Ian Romanick <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42755
Reviewed-by: Kenneth Graunke <[email protected]>
Cc: Vinson Lee <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index d5b04e9d7bb..f0c92187507 100644 --- a/src/glsl/ast_to_hir.cpp +++ b/src/glsl/ast_to_hir.cpp @@ -1184,7 +1184,7 @@ ast_expression::hir(exec_list *instructions, error_emitted = true; } - type = op[0]->type; + type = error_emitted ? glsl_type::error_type : op[0]->type; result = new(ctx) ir_expression(ir_unop_bit_not, type, op[0], NULL); break; |