Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-07 06:35:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PICA] Fix more shader bugs

Browse source
This commit is contained in:
wheremyfoodat 2022-09-27 02:27:41 +03:00
parent f90dd2d60b
commit 4d1bb6f866
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/PICA/regs.hpp
View file

@ -59,6 +59,7 @@ namespace PICAInternalRegs {
VertexIntUniform2 = 0x2B3, VertexIntUniform2 = 0x2B3,
VertexIntUniform3 = 0x2B4, VertexIntUniform3 = 0x2B4,
VertexShaderEntrypoint = 0x2BA,
VertexShaderTransferEnd = 0x2BF, VertexShaderTransferEnd = 0x2BF,
VertexFloatUniformIndex = 0x2C0, VertexFloatUniformIndex = 0x2C0,
VertexFloatUniformData0 = 0x2C1, VertexFloatUniformData0 = 0x2C1,

3
include/PICA/shader.hpp
View file

@ -150,7 +150,8 @@ class PICAShader {
public: public:
std::array<u32, 512> loadedShader; // Currently loaded & active shader std::array<u32, 512> loadedShader; // Currently loaded & active shader
std::array<u32, 512> bufferedShader; // Shader to be transferred when the SH_CODETRANSFER_END reg gets written to std::array<u32, 512> bufferedShader; // Shader to be transferred when the SH_CODETRANSFER_END reg gets written to
u32 entrypoint = 0; // Initial shader PC
u32 boolUniform; u32 boolUniform;
std::array<OpenGL::Vector<u8, 4>, 4> intUniforms; std::array<OpenGL::Vector<u8, 4>, 4> intUniforms;
std::array<vec4f, 96> floatUniforms; std::array<vec4f, 96> floatUniforms;

4
src/core/PICA/regs.cpp
View file

@ -113,6 +113,10 @@ void GPU::writeInternalReg(u32 index, u32 value, u32 mask) {
shaderUnit.vs.uploadWord(value); shaderUnit.vs.uploadWord(value);
break; break;
case VertexShaderEntrypoint:
shaderUnit.vs.entrypoint = value & 0xffff;
break;
case VertexShaderTransferEnd: case VertexShaderTransferEnd:
if (value != 0) shaderUnit.vs.finalize(); if (value != 0) shaderUnit.vs.finalize();
break; break;

6
src/core/PICA/shader_interpreter.cpp
View file

@ -2,7 +2,7 @@
#include <cmath> #include <cmath>
void PICAShader::run() { void PICAShader::run() {
pc = 0; pc = entrypoint;
loopIndex = 0; loopIndex = 0;
ifIndex = 0; ifIndex = 0;
callIndex = 0; callIndex = 0;
@ -63,7 +63,7 @@ void PICAShader::run() {
// Handle calls // Handle calls
if (callIndex != 0) { if (callIndex != 0) {
auto& info = callInfo[callIndex - 1]; auto& info = callInfo[callIndex - 1];
if (pc == info.endingPC) { // Check if the IF block ended if (pc == info.endingPC) { // Check if the CALL block ended
pc = info.returnPC; pc = info.returnPC;
callIndex -= 1; callIndex -= 1;
} }
@ -121,7 +121,7 @@ bool PICAShader::isCondTrue(u32 instruction) {
return cmpRegister[0] == refX && cmpRegister[1] == refY; return cmpRegister[0] == refX && cmpRegister[1] == refY;
case 2: // At least cmp.x matches case 2: // At least cmp.x matches
return cmpRegister[0] == refX; return cmpRegister[0] == refX;
case 3: // At least cmp.y matches default: // At least cmp.y matches
return cmpRegister[1] == refY; return cmpRegister[1] == refY;
} }
} }