From: Kenneth Graunke Date: Sun, 16 Dec 2012 08:02:43 +0000 (-0800) Subject: i965/vs: Always store pull constant offsets in GRFs on Gen8. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93658054c03b4463d301be83b20c8933e49a5771;p=mesa.git i965/vs: Always store pull constant offsets in GRFs on Gen8. We need to SEND from a GRF, and we can only obtain those prior to register allocation. This allows us to do pull constant loads without the MRF hack. v2: Reword comments (suggested by Paul). Signed-off-by: Kenneth Graunke Reviewed-by: Paul Berry --- diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index a13eafb7d4a..9c1975b3e5e 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1581,7 +1581,16 @@ vec4_visitor::visit(ir_expression *ir) src_reg surf_index = src_reg(prog_data->base.binding_table.ubo_start + uniform_block->value.u[0]); if (const_offset_ir) { - offset = src_reg(const_offset / 16); + if (brw->gen >= 8) { + /* Store the offset in a GRF so we can send-from-GRF. */ + offset = src_reg(this, glsl_type::int_type); + emit(MOV(dst_reg(offset), src_reg(const_offset / 16))); + } else { + /* Immediates are fine on older generations since they'll be moved + * to a (potentially fake) MRF at the generator level. + */ + offset = src_reg(const_offset / 16); + } } else { offset = src_reg(this, glsl_type::uint_type); emit(SHR(dst_reg(offset), op[1], src_reg(4))); @@ -2982,6 +2991,11 @@ vec4_visitor::get_pull_constant_offset(vec4_instruction *inst, } return index; + } else if (brw->gen >= 8) { + /* Store the offset in a GRF so we can send-from-GRF. */ + src_reg offset = src_reg(this, glsl_type::int_type); + emit_before(inst, MOV(dst_reg(offset), src_reg(reg_offset))); + return offset; } else { int message_header_scale = brw->gen < 6 ? 16 : 1; return src_reg(reg_offset * message_header_scale);