KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600/sfn: Fix ordering of tex param moves 

Both moves should happen in the same instuction group, otherwise the
lod/bias value will be overwritten by the shadow compare value.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6706>
This commit is contained in:
Gert Wollny 2020-08-02 19:35:58 +02:00 committed by Marge Bot
parent daaa71924a
commit f2280e03e2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gallium/drivers/r600/sfn/sfn_emittexinstruction.cpp
View File

@ -539,15 +539,15 @@ bool EmitTexInstruction::emit_tex_txl(nir_tex_instr* instr, TexInputs& src)
<< "' (" << __func__ << ")\n";
auto tex_op = TexInstruction::sample_l;
emit_instruction(new AluInstruction(op1_mov, src.coord.reg_i(3), src.lod,
{alu_last_instr, alu_write}));
if (instr->is_shadow) {
emit_instruction(new AluInstruction(op1_mov, src.coord.reg_i(2), src.comperator,
{alu_last_instr, alu_write}));
{alu_write}));
tex_op = TexInstruction::sample_c_l;
}
emit_instruction(new AluInstruction(op1_mov, src.coord.reg_i(3), src.lod,
{alu_last_instr, alu_write}));
auto sampler = get_samplerr_id(instr->sampler_index, src.sampler_deref);
assert(!sampler.indirect && "Indirect sampler selection not yet supported");
@ -571,14 +571,15 @@ bool EmitTexInstruction::emit_tex_txb(nir_tex_instr* instr, TexInputs& src)
std::array<uint8_t, 4> in_swizzle = {0,1,2,3};
if (instr->is_shadow) {
emit_instruction(new AluInstruction(op1_mov, src.coord.reg_i(2), src.comperator,
{alu_write}));
tex_op = TexInstruction::sample_c_lb;
}
emit_instruction(new AluInstruction(op1_mov, src.coord.reg_i(3), src.bias,
{alu_last_instr, alu_write}));
if (instr->is_shadow) {
emit_instruction(new AluInstruction(op1_mov, src.coord.reg_i(2), src.comperator,
{alu_last_instr, alu_write}));
tex_op = TexInstruction::sample_c_lb;
}
GPRVector tex_src(src.coord, in_swizzle);