The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-22 09:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Latte: Fix syntax error in generated GLSL

Browse Source
This commit is contained in:
Exzap 2024-01-14 23:40:29 +01:00
parent 223833cac4
commit 9b0a1d53dc
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Cafe/HW/Latte/LegacyShaderDecompiler/LatteDecompilerEmitGLSL.cpp
View File

@ -246,6 +246,22 @@ static void _appendPVPS(LatteDecompilerShaderContext* shaderContext, StringBuf*
_appendChannel(src, aluUnit); _appendChannel(src, aluUnit);
} }
std::string _FormatFloatAsGLSLConstant(float f)
{
char floatAsStr[64];
size_t floatAsStrLen = fmt::format_to_n(floatAsStr, 64, "{:#}", f).size;
size_t floatAsStrLenOrg = floatAsStrLen;
if(floatAsStrLen > 0 && floatAsStr[floatAsStrLen-1] == '.')
{
floatAsStr[floatAsStrLen] = '0';
floatAsStrLen++;
}
cemu_assert(floatAsStrLen < 50); // constant suspiciously long?
floatAsStr[floatAsStrLen] = '\0';
cemu_assert_debug(floatAsStrLen >= 3); // shortest possible form is "0.0"
return floatAsStr;
}
// tracks PV/PS and register backups // tracks PV/PS and register backups
struct ALUClauseTemporariesState struct ALUClauseTemporariesState
{ {
@ -926,15 +942,7 @@ void _emitOperandInputCode(LatteDecompilerShaderContext* shaderContext, LatteDec
exponent -= 127; exponent -= 127;
if ((constVal & 0xFF) == 0 && exponent >= -10 && exponent <= 10) if ((constVal & 0xFF) == 0 && exponent >= -10 && exponent <= 10)
{ {
char floatAsStr[32]; src->add(_FormatFloatAsGLSLConstant(*(float*)&constVal));
size_t floatAsStrLen = fmt::format_to_n(floatAsStr, 32, "{:#}", *(float*)&constVal).size;
if(floatAsStrLen > 0 && floatAsStr[floatAsStrLen-1] == '.')
{
floatAsStr[floatAsStrLen] = '0';
floatAsStrLen++;
}
cemu_assert_debug(floatAsStrLen >= 3); // shortest possible form is "0.0"
src->add(std::string_view(floatAsStr, floatAsStrLen));
} }
else else
src->addFmt("intBitsToFloat(0x{:08x})", constVal); src->addFmt("intBitsToFloat(0x{:08x})", constVal);
@ -2561,13 +2569,11 @@ void _emitTEXSampleTextureCode(LatteDecompilerShaderContext* shaderContext, Latt
// lod or lod bias parameter // lod or lod bias parameter
if( texOpcode == GPU7_TEX_INST_SAMPLE_L || texOpcode == GPU7_TEX_INST_SAMPLE_LB || texOpcode == GPU7_TEX_INST_SAMPLE_C_L) if( texOpcode == GPU7_TEX_INST_SAMPLE_L || texOpcode == GPU7_TEX_INST_SAMPLE_LB || texOpcode == GPU7_TEX_INST_SAMPLE_C_L)
{ {
src->add(",");
if(texOpcode == GPU7_TEX_INST_SAMPLE_LB) if(texOpcode == GPU7_TEX_INST_SAMPLE_LB)
src->addFmt("{}", (float)texInstruction->textureFetch.lodBias / 16.0f); src->add(_FormatFloatAsGLSLConstant((float)texInstruction->textureFetch.lodBias / 16.0f));
else else
{
src->add(",");
_emitTEXSampleCoordInputComponent(shaderContext, texInstruction, 3, LATTE_DECOMPILER_DTYPE_FLOAT); _emitTEXSampleCoordInputComponent(shaderContext, texInstruction, 3, LATTE_DECOMPILER_DTYPE_FLOAT);
}
} }
else if( texOpcode == GPU7_TEX_INST_SAMPLE_LZ || texOpcode == GPU7_TEX_INST_SAMPLE_C_LZ ) else if( texOpcode == GPU7_TEX_INST_SAMPLE_LZ || texOpcode == GPU7_TEX_INST_SAMPLE_C_LZ )
{ {