From 9390cb84593bda516e8c1521c87a08475574d1be Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 1 Sep 2015 22:00:24 -0700 Subject: [PATCH] i965/fs: Handle MRF destinations in lower_integer_multiplication(). The lowered code reads from the destination, which isn't possible from message registers. Fixes the following dEQP tests on SNB: dEQP-GLES3.functional.shaders.precision.int.highp_mul_fragment dEQP-GLES3.functional.shaders.precision.int.mediump_mul_fragment dEQP-GLES3.functional.shaders.precision.int.lowp_mul_fragment Cc: "10.6 11.0" Tested-by: Mark Janes Reviewed-by: Kenneth Graunke Reviewed-by: Jason Ekstrand --- src/mesa/drivers/dri/i965/brw_fs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 269914d64a8..e28eb5db026 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -3192,7 +3192,8 @@ fs_visitor::lower_integer_multiplication() * schedule multi-component multiplications much better. */ - if (inst->conditional_mod && inst->dst.is_null()) { + fs_reg orig_dst = inst->dst; + if (orig_dst.is_null() || orig_dst.file == MRF) { inst->dst = fs_reg(GRF, alloc.allocate(dispatch_width / 8), inst->dst.type); } @@ -3258,10 +3259,9 @@ fs_visitor::lower_integer_multiplication() ibld.ADD(dst, low, high); - if (inst->conditional_mod) { - fs_reg null(retype(ibld.null_reg_f(), inst->dst.type)); + if (inst->conditional_mod || orig_dst.file == MRF) { set_condmod(inst->conditional_mod, - ibld.MOV(null, inst->dst)); + ibld.MOV(orig_dst, inst->dst)); } } -- 2.30.2