From a8a6b2cd8a6bdfcb0c76397f1e32f038006b1b4d Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 10 May 2017 18:04:22 -0700 Subject: [PATCH] SoftGPU: Jit swizzled texel lookup. --- GPU/Software/Sampler.h | 1 + GPU/Software/SamplerX86.cpp | 80 ++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/GPU/Software/Sampler.h b/GPU/Software/Sampler.h index 911625bf37..babdbfac7b 100644 --- a/GPU/Software/Sampler.h +++ b/GPU/Software/Sampler.h @@ -102,6 +102,7 @@ private: bool Jit_ReadTextureFormat(const SamplerID &id); bool Jit_GetTexData(const SamplerID &id, int bitsPerTexel); + bool Jit_GetTexDataSwizzled(const SamplerID &id, int bitsPerTexel); bool Jit_Decode5650(); bool Jit_Decode5551(); bool Jit_Decode4444(); diff --git a/GPU/Software/SamplerX86.cpp b/GPU/Software/SamplerX86.cpp index 0556769b8b..1d3fe66faf 100644 --- a/GPU/Software/SamplerX86.cpp +++ b/GPU/Software/SamplerX86.cpp @@ -151,7 +151,7 @@ bool SamplerJitCache::Jit_ReadTextureFormat(const SamplerID &id) { bool SamplerJitCache::Jit_GetTexData(const SamplerID &id, int bitsPerTexel) { if (id.swizzle) { - return false; + return Jit_GetTexDataSwizzled(id, bitsPerTexel); } // srcReg might be EDX, so let's copy that before we multiply. @@ -205,6 +205,84 @@ bool SamplerJitCache::Jit_GetTexData(const SamplerID &id, int bitsPerTexel) { return true; } +bool SamplerJitCache::Jit_GetTexDataSwizzled(const SamplerID &id, int bitsPerTexel) { + LEA(32, tempReg1, MScaled(vReg, SCALE_4, 0)); + AND(32, R(tempReg1), Imm32(31)); + if (bitsPerTexel != 4) { + AND(32, R(vReg), Imm32(~7)); + } + + MOV(32, R(tempReg2), R(uReg)); + MOV(32, R(resultReg), R(uReg)); + switch (bitsPerTexel) { + case 32: + SHR(32, R(resultReg), Imm8(2)); + break; + case 16: + SHR(32, R(vReg), Imm8(1)); + SHR(32, R(tempReg2), Imm8(1)); + SHR(32, R(resultReg), Imm8(3)); + break; + case 8: + SHR(32, R(vReg), Imm8(2)); + SHR(32, R(tempReg2), Imm8(2)); + SHR(32, R(resultReg), Imm8(4)); + break; + case 4: + SHR(32, R(vReg), Imm8(3)); + SHR(32, R(tempReg2), Imm8(3)); + SHR(32, R(resultReg), Imm8(5)); + break; + default: + return false; + } + AND(32, R(tempReg2), Imm32(3)); + SHL(32, R(resultReg), Imm8(5)); + ADD(32, R(tempReg1), R(tempReg2)); + ADD(32, R(tempReg1), R(resultReg)); + + // We may clobber srcReg in the MUL, so let's grab it now. + LEA(64, tempReg1, MComplex(srcReg, tempReg1, SCALE_4, 0)); + + LEA(32, EAX, MScaled(bufwReg, SCALE_4, 0)); + MUL(32, R(vReg)); + + switch (bitsPerTexel) { + case 32: + MOV(bitsPerTexel, R(resultReg), MRegSum(tempReg1, EAX)); + break; + case 16: + AND(32, R(uReg), Imm32(1)); + // Multiply by two by just adding twice. + ADD(32, R(EAX), R(uReg)); + ADD(32, R(EAX), R(uReg)); + MOV(bitsPerTexel, R(resultReg), MRegSum(tempReg1, EAX)); + break; + case 8: + AND(32, R(uReg), Imm32(3)); + ADD(32, R(EAX), R(uReg)); + MOV(bitsPerTexel, R(resultReg), MRegSum(tempReg1, EAX)); + break; + case 4: { + AND(32, R(uReg), Imm32(7)); + SHR(32, R(uReg), Imm8(1)); + // Note: LEA/MOV do not affect flags (unlike ADD.) uReg may be RCX. + LEA(64, tempReg1, MRegSum(tempReg1, uReg)); + MOV(8, R(resultReg), MRegSum(tempReg1, EAX)); + FixupBranch skipNonZero = J_CC(CC_NC); + SHR(32, R(resultReg), Imm32(4)); + SetJumpTarget(skipNonZero); + // Zero out the rest. + AND(32, R(resultReg), Imm32(0x0000000F)); + break; + } + default: + return false; + } + + return true; +} + bool SamplerJitCache::Jit_Decode5650() { return false; }