From: Timothy Arceri Date: Wed, 27 Jun 2018 23:23:20 +0000 (+1000) Subject: glsl: skip comparison opt when adding vars of different size X-Git-Tag: upstream/19.0.0~4230 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a5121bf355001e2c69ba05e8d9be4ed633c7bf4;p=platform%2Fupstream%2Fmesa.git 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: 34ec1a24d61f ("glsl: Optimize (x + y cmp 0) into (x cmp -y).") Reviewed-by: Ian Romanick --- diff --git a/src/compiler/glsl/opt_algebraic.cpp b/src/compiler/glsl/opt_algebraic.cpp index 1a8ee36..ff4be26 100644 --- a/src/compiler/glsl/opt_algebraic.cpp +++ b/src/compiler/glsl/opt_algebraic.cpp @@ -709,6 +709,12 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir) if (!is_vec_zero(zero)) 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 * (0 cmp x+y) into (-x cmp y) or (x+y cmp 0) into (x cmp -y) */