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

[GPU] Fix order of operands to mix() in the interpolation combine mode.

Browse source
This commit is contained in:
fleroviux 2023-06-17 00:12:07 +02:00
parent bcf6401d4d
commit 76d6140797
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,7 +139,7 @@ const char* fragmentShader = R"(
case 1u: result.rgb = source0.rgb * source1.rgb; break; // Modulate
case 2u: result.rgb = min(vec3(1.0), source0.rgb + source1.rgb); break; // Add
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(source0.rgb, source1.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 6u: result.rgb = vec3(dot(source0.rgb, source1.rgb)); break; // Dot3 RGB
case 7u: result.rgb = vec3(dot(source0, source1)); break; // Dot3 RGBA, TODO: not sure if this is correct?
@ -153,7 +153,7 @@ const char* fragmentShader = R"(
case 1u: result.a = source0.a * source1.a; break; // Modulate
case 2u: result.a = min(1.0, source0.a + source1.a); break; // Add
case 3u: result.a = clamp(source0.a + source1.a - 0.5, 0.0, 1.0); break; // Add signed
case 4u: result.a = mix(source0.a, source1.a, source2.a); break; // Interpolate
case 4u: result.a = mix(source1.a, source0.a, source2.a); break; // Interpolate
case 5u: result.a = max(0.0, source0.a - source1.a); break; // Subtract
case 6u: result.a = dot(source0.rgb, source1.rgb); break; // Dot3 RGB
case 7u: result.a = dot(source0, source1); break; // Dot3 RGBA, TODO: not sure if this is correct?