retro-v2 softlight, further refinements to border & softlight gradations

libretro · Oct 15, 2022 · 34e3d2e · 34e3d2e
1 parent 5870471
commit 34e3d2e
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/reshade/retro-v2-softlight-subtle.glslp b/reshade/retro-v2-softlight-subtle.glslp
@@ -4,10 +4,13 @@ shader1 = shaders/blendsoftlight/blendsoftlight.glsl
 
 
 
-textures = "overlay;BORDER"
+textures = "overlay;overlay2;BORDER;BORDERTHICK"
 # change this path to point to your overlay image
-overlay = shaders/blendsoftlight/shine_subtle.png
+overlay = shaders/blendsoftlight/shine720_subtle.png
+overlay2 = shaders/blendsoftlight/shineblack720.png
 BORDER = shaders/blendsoftlight/border.png
+BORDERTHICK = shaders/blendsoftlight/borderthick.png
+ThickBool = 0.0
 OverlayMix = 1.0
 ASPECTRATIO = "43.0"
 

diff --git a/reshade/retro-v2-softlight.glslp b/reshade/retro-v2-softlight.glslp
@@ -4,10 +4,13 @@ shader1 = shaders/blendsoftlight/blendsoftlight.glsl
 
 
 
-textures = "overlay;BORDER"
+textures = "overlay;overlay2;BORDER;BORDERTHICK"
 # change this path to point to your overlay image
-overlay = shaders/blendsoftlight/shine.png
+overlay = shaders/blendsoftlight/shine720.png
+overlay2 = shaders/blendsoftlight/shineblack720.png
 BORDER = shaders/blendsoftlight/border.png
+BORDERTHICK = shaders/blendsoftlight/borderthick.png
+ThickBool = 0.0
 OverlayMix = 1.0
 ASPECTRATIO = "43.0"
 

diff --git a/reshade/shaders/blendsoftlight/blendsoftlight.glsl b/reshade/shaders/blendsoftlight/blendsoftlight.glsl
@@ -15,6 +15,7 @@
 #pragma parameter OverlayMix "Overlay Mix" 1.0 0.0 1.0 0.05
 #pragma parameter SCALE "Box Scale" 4.0 0.25 4.0 0.05
 #pragma parameter ASPECTRATIO "Aspect Ratio" 87.0 43.0 87.0 44.0
+#pragma parameter ThickBool "Thick Borders" 0.0 0.0 1.0 1.0
 
 #if defined(VERTEX)
 
@@ -110,7 +111,9 @@ uniform COMPAT_PRECISION vec2 TextureSize;
 uniform COMPAT_PRECISION vec2 InputSize;
 uniform sampler2D Texture;
 uniform sampler2D BORDER;
+uniform sampler2D BORDERTHICK;
 uniform sampler2D overlay;
+uniform sampler2D overlay2;
 COMPAT_VARYING vec4 TEX0;
 
 // compatibility #defines
@@ -123,9 +126,11 @@ COMPAT_VARYING vec4 TEX0;
 #ifdef PARAMETER_UNIFORM
 uniform COMPAT_PRECISION float OverlayMix;
 uniform COMPAT_PRECISION float ASPECTRATIO;
+uniform COMPAT_PRECISION float ThickBool;
 #else
 #define OverlayMix 1.0
 #define ASPECTRATIO 43.0
+#define ThickBool 0.0
 #endif
 
 float blendSoftlight(float base, float blend) {
@@ -135,21 +140,30 @@ float blendSoftlight(float base, float blend) {
 void main()
 {
 
-    vec4 frame  =   COMPAT_TEXTURE(Source, vTexCoord).rgba;
-    vec4 softlight =   COMPAT_TEXTURE(overlay, vTexCoord).rgba;
+    vec4 frame     = COMPAT_TEXTURE(Source, vTexCoord).rgba;
+    vec4 softlight = COMPAT_TEXTURE(overlay, vTexCoord).rgba;
+    if ( OverlayMix < 1.0 ){
+        softlight   = COMPAT_TEXTURE(overlay2, vTexCoord).rgba;
+        softlight.a = OverlayMix;
+    }
 
     vec4 ImageFinal  = frame;
 
     ImageFinal.r = blendSoftlight(frame.r,softlight.r);
     ImageFinal.g = blendSoftlight(frame.g,softlight.g);
     ImageFinal.b = blendSoftlight(frame.b,softlight.b);
     ImageFinal.a = blendSoftlight(frame.a,softlight.a);
-    ImageFinal   = mix(frame,clamp(ImageFinal,0.0,OverlayMix),softlight.a);
+    ImageFinal   = mix(frame,ImageFinal,softlight.a);
+    // ImageFinal   = mix(frame,clamp(ImageFinal,0.0,OverlayMix),softlight.a);
+
 
     if (ASPECTRATIO == 87.0) {
         vec4 background = COMPAT_TEXTURE(BORDER, vTexCoord);
-
-        FragColor = vec4(mix(ImageFinal, background, background.a));
+        if(ThickBool == 1.0){
+            background = COMPAT_TEXTURE(BORDERTHICK, vTexCoord);
+        }
+
+        FragColor       = vec4(mix(ImageFinal, background, background.a));
     }
     else{
         FragColor = vec4(ImageFinal);

diff --git a/reshade/shaders/blendsoftlight/border.png b/reshade/shaders/blendsoftlight/border.png
diff --git a/reshade/shaders/blendsoftlight/borderthick.png b/reshade/shaders/blendsoftlight/borderthick.png
diff --git a/reshade/shaders/blendsoftlight/shine.png b/reshade/shaders/blendsoftlight/shine.png
diff --git a/reshade/shaders/blendsoftlight/shine720.png b/reshade/shaders/blendsoftlight/shine720.png
diff --git a/reshade/shaders/blendsoftlight/shine720_subtle.png b/reshade/shaders/blendsoftlight/shine720_subtle.png
diff --git a/reshade/shaders/blendsoftlight/shineblack720.png b/reshade/shaders/blendsoftlight/shineblack720.png