All users of brw_send_indirect_surface_message() should be providing a full descriptor immediate up front by now, this isn't necessary anymore. --- src/intel/compiler/brw_eu_emit.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/intel/compiler/brw_eu_emit.c b/src/intel/compiler/brw_eu_emit.c index f414a5753f6..e36cdadc70a 100644 --- a/src/intel/compiler/brw_eu_emit.c +++ b/src/intel/compiler/brw_eu_emit.c @@ -2475,7 +2475,7 @@ brw_send_indirect_message(struct brw_codegen *p, return &p->store[setup]; } -static struct brw_inst * +static void brw_send_indirect_surface_message(struct brw_codegen *p, unsigned sfid, struct brw_reg dst, @@ -2483,8 +2483,6 @@ brw_send_indirect_surface_message(struct brw_codegen *p, struct brw_reg surface, unsigned desc_imm) { - struct brw_inst *insn; - if (surface.file != BRW_IMMEDIATE_VALUE) { struct brw_reg addr = retype(brw_address_reg(0), BRW_REGISTER_TYPE_UD); @@ -2497,19 +2495,17 @@ brw_send_indirect_surface_message(struct brw_codegen *p, /* Mask out invalid bits from the surface index to avoid hangs e.g. when * some surface array is accessed out of bounds. */ - insn = brw_AND(p, addr, - suboffset(vec1(retype(surface, BRW_REGISTER_TYPE_UD)), - BRW_GET_SWZ(surface.swizzle, 0)), - brw_imm_ud(0xff)); + brw_AND(p, addr, + suboffset(vec1(retype(surface, BRW_REGISTER_TYPE_UD)), + BRW_GET_SWZ(surface.swizzle, 0)), + brw_imm_ud(0xff)); brw_pop_insn_state(p); surface = addr; } - insn = brw_send_indirect_message(p, sfid, dst, payload, surface, desc_imm); - - return insn; + brw_send_indirect_message(p, sfid, dst, payload, surface, desc_imm); } static bool -- 2.16.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev