diff options
| author | Paul Berry <stereotype441@gmail.com> | 2011-10-06 11:28:42 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2011-10-31 11:24:03 -0700 |
| commit | b726639e1be0614fb6bbb75a6f07c63eacc6d787 (patch) | |
| tree | b2f781d0f0c31433ca86e93bb2b4dc0ea64830f2 | |
| parent | d09b1109d4ea42c54ec40aa7dad0591aa3622436 (diff) | |
glsl: Fix copy-paste error in constant_expression_value(ir_binop_nequal)
The implementation of ir_binop_nequal in constant_expression_value()
appears to have been copy-and-pasted from the implementation of
ir_binop_equal, but with all instances of '==' changed to '!='. This
is correct except for one minor flaw: one of those '==' operators was
in an assertion checking that the types of the two arguments were
equal. That one needs to stay an '=='.
Fixes piglit tests {fs,vs}-inline-notequal.
| -rw-r--r-- | src/glsl/ir_constant_expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 83f084d883d..492be325fb3 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/glsl/ir_constant_expression.cpp @@ -719,7 +719,7 @@ ir_expression::constant_expression_value() } break; case ir_binop_nequal: - assert(op[0]->type != op[1]->type); + assert(op[0]->type == op[1]->type); for (unsigned c = 0; c < components; c++) { switch (op[0]->type->base_type) { case GLSL_TYPE_UINT: |