Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update submodule SPIRV-Cross, remove workarounds that are no longer needed

Browse source
This commit is contained in:
Henrik Rydgård 2017-05-31 14:09:47 +02:00
parent 5b3ca89ee2
commit cae39adab3
2 changed files with 1 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
GPU/Common/ShaderTranslation.cpp
View file

@ -78,51 +78,6 @@ struct Builtin {
const char *replacement;
};
// Workaround for deficiency in SPIRV-Cross
static const Builtin builtins[] = {
{"lessThan",
R"(
bool2 lessThan(float2 a, float2 b) { return bool2(a.x < b.x, a.y < b.y); }
bool3 lessThan(float3 a, float3 b) { return bool3(a.x < b.x, a.y < b.y, a.z < b.z); }
bool4 lessThan(float4 a, float4 b) { return bool4(a.x < b.x, a.y < b.y, a.z < b.z, a.w < b.w); }
)"},
{ "lessThanEqual",
R"(
bool2 lessThanEqual(float2 a, float2 b) { return bool2(a.x <= b.x, a.y <= b.y); }
bool3 lessThanEqual(float3 a, float3 b) { return bool3(a.x <= b.x, a.y <= b.y, a.z <= b.z); }
bool4 lessThanEqual(float4 a, float4 b) { return bool4(a.x <= b.x, a.y <= b.y, a.z <= b.z, a.w <= b.w); }
)" },
{ "greaterThan",
R"(
bool2 greaterThan(float2 a, float2 b) { return bool2(a.x > b.x, a.y > b.y); }
bool3 greaterThan(float3 a, float3 b) { return bool3(a.x > b.x, a.y > b.y, a.z > b.z); }
bool4 greaterThan(float4 a, float4 b) { return bool4(a.x > b.x, a.y > b.y, a.z > b.z, a.w > b.w); }
)" },
{ "greaterThanEqual",
R"(
bool2 greaterThanEqual(float2 a, float2 b) { return bool2(a.x >= b.x, a.y >= b.y); }
bool3 greaterThanEqual(float3 a, float3 b) { return bool3(a.x >= b.x, a.y >= b.y, a.z >= b.z); }
bool4 greaterThanEqual(float4 a, float4 b) { return bool4(a.x >= b.x, a.y >= b.y, a.z >= b.z, a.w >= b.w); }
)" },
{ "equal",
R"(
bool2 equal(float2 a, float2 b) { return bool2(a.x == b.x, a.y == b.y); }
bool3 equal(float3 a, float3 b) { return bool3(a.x == b.x, a.y == b.y, a.z == b.z); }
bool4 equal(float4 a, float4 b) { return bool4(a.x == b.x, a.y == b.y, a.z == b.z, a.w == b.w); }
)" },
{ "notEqual",
R"(
bool2 notEqual(float2 a, float2 b) { return bool2(a.x != b.x, a.y != b.y); }
bool3 notEqual(float3 a, float3 b) { return bool3(a.x != b.x, a.y != b.y, a.z != b.z); }
bool4 notEqual(float4 a, float4 b) { return bool4(a.x != b.x, a.y != b.y, a.z != b.z, a.w != b.w); }
)" },
};
static const Builtin replacements[] = {
{ "mix(", "lerp(" },
{ "fract(", "frac(" },
};
static const char *cbufferDecl = R"(
cbuffer data : register(b0) {
float2 u_texelDelta;
@ -144,20 +99,6 @@ std::string Postprocess(std::string code, ShaderLanguage lang, Draw::ShaderStage
// Output the uniform buffer.
out << cbufferDecl;
// Add the builtins if required.
for (int i = 0; i < ARRAY_SIZE(builtins); i++) {
if (!builtins[i].needle)
continue;
if (code.find(builtins[i].needle) != std::string::npos) {
out << builtins[i].replacement;
}
}
// Perform some replacements
for (int i = 0; i < ARRAY_SIZE(replacements); i++) {
code = ReplaceAll(code, replacements[i].needle, replacements[i].replacement);
}
// Alright, now let's go through it line by line and zap the single uniforms.
std::string line;
std::stringstream instream(code);

2
ext/SPIRV-Cross

@ -1 +1 @@
Subproject commit 6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6
Subproject commit 90966d50f57608587bafd95b4e345b02b814754a