glsl: skip comparison opt when adding vars of different size

The spec allows adding scalars with a vector or matrix. In this case
the opt was losing swizzle and size information.

This fixes a bug with Doom (2016) shaders.

Fixes: 34ec1a24d6 ("glsl: Optimize (x + y cmp 0) into (x cmp -y).")

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Timothy Arceri
2018-06-28 09:23:20 +10:00
parent e8eb182ec5
commit 2a5121bf35

View File

@@ -709,6 +709,12 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir)
if (!is_vec_zero(zero)) if (!is_vec_zero(zero))
continue; continue;
/* We are allowed to add scalars with a vector or matrix. In that
* case lets just exit early.
*/
if (add->operands[0]->type != add->operands[1]->type)
continue;
/* Depending of the zero position we want to optimize /* Depending of the zero position we want to optimize
* (0 cmp x+y) into (-x cmp y) or (x+y cmp 0) into (x cmp -y) * (0 cmp x+y) into (-x cmp y) or (x+y cmp 0) into (x cmp -y)
*/ */