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

[GPU] Disable the alpha combiner when the color combiner is in "Dot3 RGBA" configuration

Browse source
This commit is contained in:
fleroviux 2023-06-20 20:46:01 +02:00
parent a30f9ccd33
commit 13a53a9e9d
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/core/renderer_gl/renderer_gl.cpp
View file

@ -141,9 +141,7 @@ const char* fragmentShader = R"(
vec4 result = vec4(1.0); vec4 result = vec4(1.0);
// TODO: // TODO: test if the alpha combiner supports all the same modes as the color combiner.
// - test Dot3 RGBA, particularly what happens when rgb_combine != alpha_combine
// - test if alpha_combine can use all the same combine modes as rgb_combine
switch (rgb_combine) { switch (rgb_combine) {
case 0u: result.rgb = source0.rgb; break; // Replace case 0u: result.rgb = source0.rgb; break; // Replace
@ -152,24 +150,25 @@ const char* fragmentShader = R"(
case 3u: result.rgb = clamp(source0.rgb + source1.rgb - 0.5, vec3(0.0), vec3(1.0)); break; // Add signed case 3u: result.rgb = clamp(source0.rgb + source1.rgb - 0.5, vec3(0.0), vec3(1.0)); break; // Add signed
case 4u: result.rgb = mix(source1.rgb, source0.rgb, source2.rgb); break; // Interpolate case 4u: result.rgb = mix(source1.rgb, source0.rgb, source2.rgb); break; // Interpolate
case 5u: result.rgb = max(vec3(0.0), source0.rgb - source1.rgb); break; // Subtract case 5u: result.rgb = max(vec3(0.0), source0.rgb - source1.rgb); break; // Subtract
case 6u: case 6u: result.rgb = vec3(4.0 * dot(source0.rgb - 0.5 , source1.rgb - 0.5)); break; // Dot3 RGB
case 7u: result.rgb = vec3(4.0 * dot(source0.rgb - 0.5 , source1.rgb - 0.5)); break; // Dot3 RGB(A) case 7u: result = vec4(4.0 * dot(source0.rgb - 0.5 , source1.rgb - 0.5)); break; // Dot3 RGBA
case 8u: result.rgb = min(vec3(1.0), source0.rgb * source1.rgb + source2.rgb); break; // Multiply then add case 8u: result.rgb = min(vec3(1.0), source0.rgb * source1.rgb + source2.rgb); break; // Multiply then add
case 9u: result.rgb = min(vec3(1.0), (source0.rgb + source1.rgb) * source2.rgb); break; // Add then multiply case 9u: result.rgb = min(vec3(1.0), (source0.rgb + source1.rgb) * source2.rgb); break; // Add then multiply
default: break; // TODO: figure out what the undocumented values do default: break; // TODO: figure out what the undocumented values do
} }
switch (alpha_combine) { if (rgb_combine != 7u) { // The color combiner also writes the alpha channel in the "Dot3 RGBA" mode.
case 0u: result.a = source0.a; break; // Replace switch (alpha_combine) {
case 1u: result.a = source0.a * source1.a; break; // Modulate case 0u: result.a = source0.a; break; // Replace
case 2u: result.a = min(1.0, source0.a + source1.a); break; // Add case 1u: result.a = source0.a * source1.a; break; // Modulate
case 3u: result.a = clamp(source0.a + source1.a - 0.5, 0.0, 1.0); break; // Add signed case 2u: result.a = min(1.0, source0.a + source1.a); break; // Add
case 4u: result.a = mix(source1.a, source0.a, source2.a); break; // Interpolate case 3u: result.a = clamp(source0.a + source1.a - 0.5, 0.0, 1.0); break; // Add signed
case 5u: result.a = max(0.0, source0.a - source1.a); break; // Subtract case 4u: result.a = mix(source1.a, source0.a, source2.a); break; // Interpolate
case 7u: result.a = 4.0 * dot(source0.rgb - 0.5 , source1.rgb - 0.5); break; // Dot3 RGB(A) case 5u: result.a = max(0.0, source0.a - source1.a); break; // Subtract
case 8u: result.a = min(1.0, source0.a * source1.a + source2.a); break; // Multiply then add case 8u: result.a = min(1.0, source0.a * source1.a + source2.a); break; // Multiply then add
case 9u: result.a = min(1.0, (source0.a + source1.a) * source2.a); break; // Add then multiply case 9u: result.a = min(1.0, (source0.a + source1.a) * source2.a); break; // Add then multiply
default: break; // TODO: figure out what the undocumented values do default: break; // TODO: figure out what the undocumented values do
}
} }
result.rgb *= float(1 << (u_textureEnvScale[tev_id] & 3u)); result.rgb *= float(1 << (u_textureEnvScale[tev_id] & 3u));