mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 18:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "internal/graphicsdriver/opengl, metal, directx: skip multiplying a scale when a color matrix is used"

Browse Source 
This reverts commit b457dc3307.

Reason: a color scale might be used with ColorM (DrawTriangles)
This commit is contained in:
Hajime Hoshi 2022-10-02 00:18:47 +09:00
parent 520c47f0e8
commit eb3c45c8af
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/graphicsdriver/directx/pipeline_windows.go
View File

@ -221,7 +221,8 @@ float4 PSMain(PSInput input) : SV_TARGET {
color = mul(color_matrix_body, color) + color_matrix_translation; color = mul(color_matrix_body, color) + color_matrix_translation;
// Premultiply alpha // Premultiply alpha
color.rgb *= color.a; color.rgb *= color.a;
// Do not apply the color scale as the scale should always be (1, 1, 1, 1) when a color matrix is used. // Apply color scale.
color *= input.color;
// Clamp the output. // Clamp the output.
color.rgb = min(color.rgb, color.a); color.rgb = min(color.rgb, color.a);
return color; return color;

1
internal/graphicsdriver/metal/graphics_darwin.go
View File

@ -197,6 +197,7 @@ struct FragmentShaderImpl {
c.rgb /= c.a + (1.0 - sign(c.a)); c.rgb /= c.a + (1.0 - sign(c.a));
c = (color_matrix_body * c) + color_matrix_translation; c = (color_matrix_body * c) + color_matrix_translation;
c.rgb *= c.a; c.rgb *= c.a;
c *= v.color;
c.rgb = min(c.rgb, c.a); c.rgb = min(c.rgb, c.a);
} else { } else {
c *= v.color; c *= v.color;

6
internal/graphicsdriver/opengl/defaultshader.go
View File

@ -237,12 +237,14 @@ void main(void) {
color = (color_matrix_body * color) + color_matrix_translation; color = (color_matrix_body * color) + color_matrix_translation;
// Premultiply alpha // Premultiply alpha
color.rgb *= color.a; color.rgb *= color.a;
// Do not apply the color scale as the scale should always be (1, 1, 1, 1) when a color matrix is used. // Apply color scale.
color *= varying_color_scale;
// Clamp the output. // Clamp the output.
color.rgb = min(color.rgb, color.a); color.rgb = min(color.rgb, color.a);
# else # else
// Apply the color scale. // Apply color scale.
color *= varying_color_scale; color *= varying_color_scale;
// No clamping needed as the color matrix shader is used then.
# endif // defined(USE_COLOR_MATRIX) # endif // defined(USE_COLOR_MATRIX)
gl_FragColor = color; gl_FragColor = color;