[Scummvm-git-logs] scummvm-shaders master -> fe5453cb4f1c6ed9439976f01f7e32f4ee7c51bb

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-shaders' repo located at https://github.com/scummvm/scummvm-shaders .

Summary:
fe5453cb4f SHADERS: Sync upstream with base


Commit: fe5453cb4f1c6ed9439976f01f7e32f4ee7c51bb
    https://github.com/scummvm/scummvm-shaders/commit/fe5453cb4f1c6ed9439976f01f7e32f4ee7c51bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-21T22:52:50+01:00

Commit Message:
SHADERS: Sync upstream with base

Changed paths:
    upstream/crt/shaders/crt-consumer.glsl
    upstream/crt/shaders/crt-guest-cgwg-curvature.glsl
    upstream/crt/shaders/fakelottes.glsl


diff --git a/upstream/crt/shaders/crt-consumer.glsl b/upstream/crt/shaders/crt-consumer.glsl
index f59312a..ebc774d 100644
--- a/upstream/crt/shaders/crt-consumer.glsl
+++ b/upstream/crt/shaders/crt-consumer.glsl
@@ -536,7 +536,8 @@ void main()
     if (inter >0.5 && InputSize.y >400.0 && fract(iTime)<0.5) res=res*0.95; else res;
     res.rgb*= vign(lum);
 }
-#if defined GL_ES
+#if 1
+    // ScummVM: Always apply the fix as we use a small texture unlike RetroArch
     // hacky clamp fix for GLES
     vec2 bordertest = (pC4);
     if ( bordertest.x > 0.0001 && bordertest.x < 0.9999 && bordertest.y > 0.0001 && bordertest.y < 0.9999)
diff --git a/upstream/crt/shaders/crt-guest-cgwg-curvature.glsl b/upstream/crt/shaders/crt-guest-cgwg-curvature.glsl
index 08b1203..e6116b5 100644
--- a/upstream/crt/shaders/crt-guest-cgwg-curvature.glsl
+++ b/upstream/crt/shaders/crt-guest-cgwg-curvature.glsl
@@ -417,7 +417,8 @@ void main()
 	color = saturation(color);
 	color*= vign(lum);
 	
-	#if defined GL_ES
+	#if 1
+	// ScummVM: Always apply the fix as we use a small texture unlike RetroArch
 	// hacky clamp fix for GLES
     	vec2 bordertest = (pos);
     		if ( bordertest.x > 0.0001 && bordertest.x < 0.9999 && bordertest.y > 0.0001 && bordertest.y < 0.9999)
diff --git a/upstream/crt/shaders/fakelottes.glsl b/upstream/crt/shaders/fakelottes.glsl
index 810479b..dbc620a 100644
--- a/upstream/crt/shaders/fakelottes.glsl
+++ b/upstream/crt/shaders/fakelottes.glsl
@@ -261,7 +261,8 @@ void main()
 	res *= Mask(gl_FragCoord.xy * 1.0001);
 #endif
 
-#if defined CURVATURE && defined GL_ES
+#if defined CURVATURE
+	// ScummVM: Always apply the fix as we use a small texture unlike RetroArch
 	// hacky clamp fix for GLES
     vec2 bordertest = (pos);
     if ( bordertest.x > 0.0001 && bordertest.x < 0.9999 && bordertest.y > 0.0001 && bordertest.y < 0.9999)