OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gv100/ir: fix OP_TXG for shadow textures

Browse Source 
doesn't seem to fix any tests now, but the previous code was obviously
incorrect and I still see fails in those CTS tests:

KHR-GL46.texture_gather.*depth*

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5576>
This commit is contained in:
Karol Herbst
2020-06-20 22:53:56 +02:00
parent 42b9aa5f5c
commit 281f777433
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gv100.cpp
View File

@@ -1190,6 +1190,14 @@ CodeEmitterGV100::emitTLD4()
{ {
const TexInstruction *insn = this->insn->asTex(); const TexInstruction *insn = this->insn->asTex();
int offsets = 0;
switch (insn->tex.useOffsets) {
case 4: offsets = 2; break;
case 1: offsets = 1; break;
case 0: offsets = 0; break;
default: assert(!"invalid offsets count"); break;
}
if (insn->tex.rIndirectSrc < 0) { if (insn->tex.rIndirectSrc < 0) {
emitInsn (0xb63); emitInsn (0xb63);
emitField(54, 5, prog->driver->io.auxCBSlot); emitField(54, 5, prog->driver->io.auxCBSlot);
@@ -1203,8 +1211,7 @@ CodeEmitterGV100::emitTLD4()
emitField(84, 1, 1); // !.EF emitField(84, 1, 1); // !.EF
emitPRED (81); emitPRED (81);
emitField(78, 1, insn->tex.target.isShadow()); emitField(78, 1, insn->tex.target.isShadow());
emitField(77, 2, insn->tex.useOffsets == 4); emitField(76, 2, offsets);
emitField(76, 2, insn->tex.useOffsets == 1);
emitField(72, 4, insn->tex.mask); emitField(72, 4, insn->tex.mask);
emitGPR (64, insn->def(1)); emitGPR (64, insn->def(1));
emitField(63, 1, insn->tex.target.isArray()); emitField(63, 1, insn->tex.target.isArray());