diff options
| author | Kenneth Graunke <[email protected]> | 2015-08-27 23:55:28 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2015-09-03 22:31:03 -0700 |
| commit | 27e83b62bb52de7a681ed82679a707555023f43d (patch) | |
| tree | 034e5685baeac0273c060883b200328547f18eb2 /src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | |
| parent | 014b90221ad5cf833bfdd55b0336771d209f0f1d (diff) | |
i965: Store a key_tex pointer in vec4_visitor.
I'm about to remove the base class for VS/GS/HS/DS program keys, at
which point we won't be able to use key->tex anymore. Instead, we'll
need to store a direct pointer (like we do in the FS backend).
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Chris Forbes <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 978d28c05ff..f85f2f95a02 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -2693,7 +2693,7 @@ vec4_visitor::emit_texture(ir_texture_opcode op, } if (devinfo->gen == 6 && op == ir_tg4) { - emit_gen6_gather_wa(key->tex.gen6_gather_wa[sampler], inst->dst); + emit_gen6_gather_wa(key_tex->gen6_gather_wa[sampler], inst->dst); } swizzle_result(op, dest, @@ -2745,7 +2745,7 @@ vec4_visitor::visit(ir_texture *ir) */ if (ir->op == ir_tg4) { ir_constant *chan = ir->lod_info.component->as_constant(); - int swiz = GET_SWZ(key->tex.swizzles[sampler], chan->value.i[0]); + int swiz = GET_SWZ(key_tex->swizzles[sampler], chan->value.i[0]); if (swiz == SWIZZLE_ZERO || swiz == SWIZZLE_ONE) { dst_reg result(this, ir->type); this->result = src_reg(result); @@ -2803,7 +2803,7 @@ vec4_visitor::visit(ir_texture *ir) ir->lod_info.sample_index->accept(this); sample_index = this->result; - if (devinfo->gen >= 7 && key->tex.compressed_multisample_layout_mask & (1<<sampler)) + if (devinfo->gen >= 7 && key_tex->compressed_multisample_layout_mask & (1 << sampler)) mcs = emit_mcs_fetch(ir->coordinate->type, coordinate, sampler_reg); else mcs = src_reg(0u); @@ -2881,14 +2881,14 @@ vec4_visitor::emit_gen6_gather_wa(uint8_t wa, dst_reg dst) uint32_t vec4_visitor::gather_channel(unsigned gather_component, uint32_t sampler) { - int swiz = GET_SWZ(key->tex.swizzles[sampler], gather_component); + int swiz = GET_SWZ(key_tex->swizzles[sampler], gather_component); switch (swiz) { case SWIZZLE_X: return 0; case SWIZZLE_Y: /* gather4 sampler is broken for green channel on RG32F -- * we must ask for blue instead. */ - if (key->tex.gather_channel_quirk_mask & (1<<sampler)) + if (key_tex->gather_channel_quirk_mask & (1 << sampler)) return 2; return 1; case SWIZZLE_Z: return 2; @@ -2903,7 +2903,7 @@ vec4_visitor::swizzle_result(ir_texture_opcode op, dst_reg dest, src_reg orig_val, uint32_t sampler, const glsl_type *dest_type) { - int s = key->tex.swizzles[sampler]; + int s = key_tex->swizzles[sampler]; dst_reg swizzled_result = dest; @@ -3717,6 +3717,7 @@ vec4_visitor::vec4_visitor(const struct brw_compiler *compiler, : backend_shader(compiler, log_data, mem_ctx, shader_prog, prog, &prog_data->base, stage), key(key), + key_tex(&key->tex), prog_data(prog_data), sanity_param_count(0), fail_msg(NULL), |