fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965/vec4: Pass sampler index in src1 for texture ops

Browse source 
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Chris Forbes 2014-08-04 19:37:58 +12:00
parent 2f4e12a835
commit 1a3fd11aef
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_vec4.h
View file

@ -526,10 +526,10 @@ public:
void emit_pack_half_2x16(dst_reg dst, src_reg src0); void emit_pack_half_2x16(dst_reg dst, src_reg src0);
void emit_unpack_half_2x16(dst_reg dst, src_reg src0); void emit_unpack_half_2x16(dst_reg dst, src_reg src0);
uint32_t gather_channel(ir_texture *ir, int sampler); uint32_t gather_channel(ir_texture *ir, uint32_t sampler);
src_reg emit_mcs_fetch(ir_texture *ir, src_reg coordinate, int sampler); src_reg emit_mcs_fetch(ir_texture *ir, src_reg coordinate, uint32_t sampler);
void emit_gen6_gather_wa(uint8_t wa, dst_reg dst); void emit_gen6_gather_wa(uint8_t wa, dst_reg dst);
void swizzle_result(ir_texture *ir, src_reg orig_val, int sampler); void swizzle_result(ir_texture *ir, src_reg orig_val, uint32_t sampler);
void emit_ndc_computation(); void emit_ndc_computation();
void emit_psiz_and_flags(struct brw_reg reg); void emit_psiz_and_flags(struct brw_reg reg);

12
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -2277,7 +2277,7 @@ vec4_visitor::visit(ir_call *ir)
} }
src_reg src_reg
vec4_visitor::emit_mcs_fetch(ir_texture *ir, src_reg coordinate, int sampler) vec4_visitor::emit_mcs_fetch(ir_texture *ir, src_reg coordinate, uint32_t sampler)
{ {
vec4_instruction *inst = new(mem_ctx) vec4_instruction(this, SHADER_OPCODE_TXF_MCS); vec4_instruction *inst = new(mem_ctx) vec4_instruction(this, SHADER_OPCODE_TXF_MCS);
inst->base_mrf = 2; inst->base_mrf = 2;
@ -2286,6 +2286,8 @@ vec4_visitor::emit_mcs_fetch(ir_texture *ir, src_reg coordinate, int sampler)
inst->dst = dst_reg(this, glsl_type::uvec4_type); inst->dst = dst_reg(this, glsl_type::uvec4_type);
inst->dst.writemask = WRITEMASK_XYZW; inst->dst.writemask = WRITEMASK_XYZW;
inst->src[1] = src_reg(sampler);
/* parameters are: u, v, r, lod; lod will always be zero due to api restrictions */ /* parameters are: u, v, r, lod; lod will always be zero due to api restrictions */
int param_base = inst->base_mrf; int param_base = inst->base_mrf;
int coord_mask = (1 << ir->coordinate->type->vector_elements) - 1; int coord_mask = (1 << ir->coordinate->type->vector_elements) - 1;
@ -2304,7 +2306,7 @@ vec4_visitor::emit_mcs_fetch(ir_texture *ir, src_reg coordinate, int sampler)
void void
vec4_visitor::visit(ir_texture *ir) vec4_visitor::visit(ir_texture *ir)
{ {
int sampler = uint32_t sampler =
_mesa_get_sampler_uniform_value(ir->sampler, shader_prog, prog); _mesa_get_sampler_uniform_value(ir->sampler, shader_prog, prog);
/* When tg4 is used with the degenerate ZERO/ONE swizzles, don't bother /* When tg4 is used with the degenerate ZERO/ONE swizzles, don't bother
@ -2437,6 +2439,8 @@ vec4_visitor::visit(ir_texture *ir)
inst->dst.writemask = WRITEMASK_XYZW; inst->dst.writemask = WRITEMASK_XYZW;
inst->shadow_compare = ir->shadow_comparitor != NULL; inst->shadow_compare = ir->shadow_comparitor != NULL;
inst->src[1] = src_reg(sampler);
/* MRF for the first parameter */ /* MRF for the first parameter */
int param_base = inst->base_mrf + inst->header_present; int param_base = inst->base_mrf + inst->header_present;
@ -2588,7 +2592,7 @@ vec4_visitor::emit_gen6_gather_wa(uint8_t wa, dst_reg dst)
* Set up the gather channel based on the swizzle, for gather4. * Set up the gather channel based on the swizzle, for gather4.
*/ */
uint32_t uint32_t
vec4_visitor::gather_channel(ir_texture *ir, int sampler) vec4_visitor::gather_channel(ir_texture *ir, uint32_t sampler)
{ {
ir_constant *chan = ir->lod_info.component->as_constant(); 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]);
@ -2609,7 +2613,7 @@ vec4_visitor::gather_channel(ir_texture *ir, int sampler)
} }
void void
vec4_visitor::swizzle_result(ir_texture *ir, src_reg orig_val, int sampler) vec4_visitor::swizzle_result(ir_texture *ir, src_reg orig_val, uint32_t sampler)
{ {
int s = key->tex.swizzles[sampler]; int s = key->tex.swizzles[sampler];