diff options
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/compiler/brw_eu_emit.c | 2 | ||||
| -rw-r--r-- | src/intel/compiler/brw_fs_generator.cpp | 48 |
2 files changed, 46 insertions, 4 deletions
diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c index ec871e5aa75..a96fe43556e 100644 --- a/src/intel/compiler/brw_eu_emit.c +++ b/src/intel/compiler/brw_eu_emit.c @@ -968,7 +968,7 @@ ALU2(DP4) ALU2(DPH) ALU2(DP3) ALU2(DP2) -ALU3F(MAD) +ALU3(MAD) ALU3F(LRP) ALU1(BFREV) ALU3(BFE) diff --git a/src/intel/compiler/brw_fs_generator.cpp b/src/intel/compiler/brw_fs_generator.cpp index 3abd7cf5388..736b3b5fba0 100644 --- a/src/intel/compiler/brw_fs_generator.cpp +++ b/src/intel/compiler/brw_fs_generator.cpp @@ -673,10 +673,52 @@ fs_generator::generate_linterp(fs_inst *inst, struct brw_reg delta_x = src[0]; struct brw_reg delta_y = offset(src[0], inst->exec_size / 8); struct brw_reg interp = src[1]; - brw_inst *i[2]; + brw_inst *i[4]; - if (devinfo->has_pln && - (devinfo->gen >= 7 || (delta_x.nr & 1) == 0)) { + if (devinfo->gen >= 11) { + struct brw_reg acc = retype(brw_acc_reg(8), BRW_REGISTER_TYPE_NF); + struct brw_reg dwP = suboffset(interp, 0); + struct brw_reg dwQ = suboffset(interp, 1); + struct brw_reg dwR = suboffset(interp, 3); + + brw_set_default_exec_size(p, BRW_EXECUTE_8); + + if (inst->exec_size == 8) { + i[0] = brw_MAD(p, acc, dwR, offset(delta_x, 0), dwP); + i[1] = brw_MAD(p, offset(dst, 0), acc, offset(delta_y, 0), dwQ); + + brw_inst_set_cond_modifier(p->devinfo, i[1], inst->conditional_mod); + + /* brw_set_default_saturate() is called before emitting instructions, + * so the saturate bit is set in each instruction, so we need to unset + * it on the first instruction of each pair. + */ + brw_inst_set_saturate(p->devinfo, i[0], false); + } else { + brw_set_default_compression_control(p, BRW_COMPRESSION_NONE); + i[0] = brw_MAD(p, acc, dwR, offset(delta_x, 0), dwP); + i[1] = brw_MAD(p, offset(dst, 0), acc, offset(delta_x, 1), dwQ); + + brw_set_default_compression_control(p, BRW_COMPRESSION_2NDHALF); + i[2] = brw_MAD(p, acc, dwR, offset(delta_y, 0), dwP); + i[3] = brw_MAD(p, offset(dst, 1), acc, offset(delta_y, 1), dwQ); + + brw_set_default_compression_control(p, BRW_COMPRESSION_COMPRESSED); + + brw_inst_set_cond_modifier(p->devinfo, i[1], inst->conditional_mod); + brw_inst_set_cond_modifier(p->devinfo, i[3], inst->conditional_mod); + + /* brw_set_default_saturate() is called before emitting instructions, + * so the saturate bit is set in each instruction, so we need to unset + * it on the first instruction of each pair. + */ + brw_inst_set_saturate(p->devinfo, i[0], false); + brw_inst_set_saturate(p->devinfo, i[2], false); + } + + return true; + } else if (devinfo->has_pln && + (devinfo->gen >= 7 || (delta_x.nr & 1) == 0)) { brw_PLN(p, dst, interp, delta_x); return false; |