i965/fs: don't pass ir_variable * to emit_samplepos_setup()

We were only using it to get at its type, which we already know because
it's a builtin variable.

Signed-off-by: Connor Abbott <connor.abbott@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Connor Abbott 2014-08-05 11:10:07 -07:00 committed by Kenneth Graunke
parent ec3d06f591
commit cbfcb1b069
3 changed files with 4 additions and 5 deletions

View file

@ -1250,13 +1250,12 @@ fs_visitor::compute_sample_position(fs_reg dst, fs_reg int_sample_pos)
}
fs_reg *
fs_visitor::emit_samplepos_setup(ir_variable *ir)
fs_visitor::emit_samplepos_setup()
{
assert(brw->gen >= 6);
assert(ir->type == glsl_type::vec2_type);
this->current_annotation = "compute sample position";
fs_reg *reg = new(this->mem_ctx) fs_reg(this, ir->type);
fs_reg *reg = new(this->mem_ctx) fs_reg(this, glsl_type::vec2_type);
fs_reg pos = *reg;
fs_reg int_sample_x = fs_reg(this, glsl_type::int_type);
fs_reg int_sample_y = fs_reg(this, glsl_type::int_type);

View file

@ -366,7 +366,7 @@ public:
glsl_interp_qualifier interpolation_mode,
bool is_centroid, bool is_sample);
fs_reg *emit_frontfacing_interpolation();
fs_reg *emit_samplepos_setup(ir_variable *ir);
fs_reg *emit_samplepos_setup();
fs_reg *emit_sampleid_setup(ir_variable *ir);
fs_reg *emit_general_interpolation(ir_variable *ir);
void emit_interpolation_setup_gen4();

View file

@ -134,7 +134,7 @@ fs_visitor::visit(ir_variable *ir)
} else if (ir->data.mode == ir_var_system_value) {
if (ir->data.location == SYSTEM_VALUE_SAMPLE_POS) {
reg = emit_samplepos_setup(ir);
reg = emit_samplepos_setup();
} else if (ir->data.location == SYSTEM_VALUE_SAMPLE_ID) {
reg = emit_sampleid_setup(ir);
} else if (ir->data.location == SYSTEM_VALUE_SAMPLE_MASK_IN) {