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

nvc0/ir: don't worry about sampler in txq handling

Browse Source 
There's no need to deal with samplers for texture size queries. That
code also was accidentally setting an invalid sIndirectSrc position, but
it can now just be removed.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
This commit is contained in:
Ilia Mirkin
2015-07-18 18:38:42 -04:00
parent 20e484afa4
commit 346ce0b988
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
View File

@@ -956,44 +956,30 @@ NVC0LoweringPass::handleTXD(TexInstruction *txd)
bool bool
NVC0LoweringPass::handleTXQ(TexInstruction *txq) NVC0LoweringPass::handleTXQ(TexInstruction *txq)
{ {
if (txq->tex.rIndirectSrc < 0 && txq->tex.sIndirectSrc < 0) if (txq->tex.rIndirectSrc < 0)
return true; return true;
Value *ticRel = txq->getIndirectR(); Value *ticRel = txq->getIndirectR();
Value *tscRel = txq->getIndirectS();
const int chipset = prog->getTarget()->getChipset(); const int chipset = prog->getTarget()->getChipset();
txq->setIndirectS(NULL); txq->setIndirectS(NULL);
txq->tex.sIndirectSrc = -1; txq->tex.sIndirectSrc = -1;
assert(ticRel);
if (chipset < NVISA_GK104_CHIPSET) { if (chipset < NVISA_GK104_CHIPSET) {
LValue *src = new_LValue(func, FILE_GPR); // 0xttxsaaaa LValue *src = new_LValue(func, FILE_GPR); // 0xttxsaaaa
if (ticRel) { txq->setSrc(txq->tex.rIndirectSrc, NULL);
txq->setSrc(txq->tex.rIndirectSrc, NULL); if (txq->tex.r)
if (txq->tex.r) ticRel = bld.mkOp2v(OP_ADD, TYPE_U32, bld.getScratch(),
ticRel = bld.mkOp2v(OP_ADD, TYPE_U32, bld.getScratch(), ticRel, bld.mkImm(txq->tex.r));
ticRel, bld.mkImm(txq->tex.r));
}
if (tscRel) {
txq->setSrc(txq->tex.sIndirectSrc, NULL);
if (txq->tex.s)
tscRel = bld.mkOp2v(OP_ADD, TYPE_U32, bld.getScratch(),
tscRel, bld.mkImm(txq->tex.s));
}
bld.loadImm(src, 0); bld.mkOp2(OP_SHL, TYPE_U32, src, ticRel, bld.mkImm(0x17));
if (ticRel)
bld.mkOp3(OP_INSBF, TYPE_U32, src, ticRel, bld.mkImm(0x0917), src);
if (tscRel)
bld.mkOp3(OP_INSBF, TYPE_U32, src, tscRel, bld.mkImm(0x0710), src);
txq->moveSources(0, 1); txq->moveSources(0, 1);
txq->setSrc(0, src); txq->setSrc(0, src);
} else { } else {
// XXX this ignores tsc, and assumes a 1:1 mapping
assert(txq->tex.rIndirectSrc >= 0);
Value *hnd = loadTexHandle( Value *hnd = loadTexHandle(
bld.mkOp2v(OP_SHL, TYPE_U32, bld.getSSA(), bld.mkOp2v(OP_SHL, TYPE_U32, bld.getSSA(),
txq->getIndirectR(), bld.mkImm(2)), txq->getIndirectR(), bld.mkImm(2)),