Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-16 02:49:48 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shader decompiler: Fix desitnation mask

Browse source
This commit is contained in:
wheremyfoodat 2024-07-26 23:30:31 +03:00
parent 5eb15de431
commit a20982f78a
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/PICA/shader_decompiler.cpp
View file

@ -65,14 +65,15 @@ ExitMode ControlFlow::analyzeFunction(const PICAShader& shader, u32 start, u32 e
return it->second; return it->second;
} }
auto setExitMode = [&it](ExitMode mode) {
it->second = mode;
return it->second;
};
// Make sure not to go out of bounds on the shader // Make sure not to go out of bounds on the shader
for (u32 pc = start; pc < PICAShader::maxInstructionCount && pc != end; pc++) { for (u32 pc = start; pc < PICAShader::maxInstructionCount && pc != end; pc++) {
const u32 instruction = shader.loadedShader[pc]; const u32 instruction = shader.loadedShader[pc];
const u32 opcode = instruction >> 26; const u32 opcode = instruction >> 26;
auto setExitMode = [&it](ExitMode mode) {
it->second = mode;
return it->second;
};
switch (opcode) { switch (opcode) {
case ShaderOpcodes::JMPC: case ShaderOpcodes::JMPC:
@ -332,10 +333,8 @@ void ShaderDecompiler::setDest(u32 operandDescriptor, const std::string& dest, c
// Don't write destination swizzle if all lanes are getting written to // Don't write destination swizzle if all lanes are getting written to
decompiledShader += fmt::format("{}{} = ", dest, writtenLaneCount == 4 ? "" : destSwizzle); decompiledShader += fmt::format("{}{} = ", dest, writtenLaneCount == 4 ? "" : destSwizzle);
if (writtenLaneCount == 1) { if (writtenLaneCount <= 3) {
decompiledShader += "float(" + value + ");\n"; decompiledShader += fmt::format("({}){};\n", value, destSwizzle);
} else if (writtenLaneCount <= 3) { // We don't need to cast for vec4, as we guarantee the rhs will be a vec4
decompiledShader += fmt::format("vec{}({});\n", writtenLaneCount, value);
} else if (writtenLaneCount == 4) { } else if (writtenLaneCount == 4) {
decompiledShader += fmt::format("{};\n", value); decompiledShader += fmt::format("{};\n", value);
} }