summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2014-08-14 20:14:34 -0700
committerKenneth Graunke <kenneth@whitecape.org>2014-08-14 23:21:34 -0700
commit650c3313786cab6f96bb480685e7b32dfcb9291c (patch)
tree13e31409899addb0169d872ffa66d946eb228551
parente84e074248efca9f5445d353fae970c8f1240de5 (diff)
i965: Fix INTDIV math assertions on Broadwell.
Commit c66d928f2c9fa59e162c391fbdd37df969959718 ("i965: Enable INTDIV in SIMD16 mode.") began using generate_math_gen6 to break SIMD16 INTDIV into two SIMD8 operations. generate_math_gen6 takes two registers - for unary operations, we pass ARF null for the second operand. Prior to Broadwell, real operands were always GRF. But now they can be IMM as well. So, check for != ARF instead of == GRF. +12 piglits. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_generator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 6efd41cdea2..5fda22bb763 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -304,7 +304,7 @@ fs_generator::generate_math_gen6(fs_inst *inst,
struct brw_reg src1)
{
int op = brw_math_function(inst->opcode);
- bool binop = src1.file == BRW_GENERAL_REGISTER_FILE;
+ bool binop = src1.file != BRW_ARCHITECTURE_REGISTER_FILE;
brw_set_default_compression_control(p, BRW_COMPRESSION_NONE);
gen6_math(p, dst, op, src0, src1);