From f10b3b0d6d5a416a757ed36902bbf74f95edabea Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 21 Dec 2021 22:03:38 +0100 Subject: [PATCH] Fix animated logo glitching on some GPUs. --- language.version | 4 ++-- shaders/glsl/LogoAnimated.fp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 9b32c5933..4ee5f317b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r92 \cu(Tue 21 Dec 22:03:30 CET 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r92 \cu(2021-12-21 22:03:30)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r93 \cu(Tue 21 Dec 22:03:38 CET 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r93 \cu(2021-12-21 22:03:38)\c-"; diff --git a/shaders/glsl/LogoAnimated.fp b/shaders/glsl/LogoAnimated.fp index afd150b92..214cc1d74 100644 --- a/shaders/glsl/LogoAnimated.fp +++ b/shaders/glsl/LogoAnimated.fp @@ -83,12 +83,12 @@ void SetupMaterial( inout Material mat ) base = blacktoalpha(base); // add alpha of first layer base.a += BilinearSample(Layer1,uv,size,pxsize).a; - // clamp - base = clamp(base,vec4(0.),vec4(1.)); // sixth layer, alpha blend tmp = BilinearSample(Layer6,uv,size,pxsize); tmp2.a = tmp.a+base.a*(1-tmp.a); tmp2.rgb = (tmp.rgb*tmp.a+base.rgb*base.a*(1-tmp.a))/tmp2.a; + // clamp + tmp2 = clamp(tmp2,vec4(0.),vec4(1.)); // ding, logo's done mat.Base = tmp2; }