From 08d25f1dd1efa69f8ea083d02640b24e8cd1d371 Mon Sep 17 00:00:00 2001 From: Arzed Five Date: Wed, 27 Jul 2016 00:45:20 +0100 Subject: [PATCH] (crtglow) All presets now correctly alias gaus_vert.slang as 'CRTPass' --- crt/crtglow_gauss.slangp | 1 + crt/crtglow_lanczos.slangp | 1 + crt/shaders/glow/resolve.slang | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crt/crtglow_gauss.slangp b/crt/crtglow_gauss.slangp index c68ef0c..890c80f 100644 --- a/crt/crtglow_gauss.slangp +++ b/crt/crtglow_gauss.slangp @@ -17,6 +17,7 @@ filter_linear2 = false scale_type2 = viewport scale2 = 1.0 srgb_framebuffer2 = true +alias2 = "CRTPass" shader3 = shaders/glow/threshold.slang filter_linear3 = false diff --git a/crt/crtglow_lanczos.slangp b/crt/crtglow_lanczos.slangp index f8f9591..86d9a95 100644 --- a/crt/crtglow_lanczos.slangp +++ b/crt/crtglow_lanczos.slangp @@ -17,6 +17,7 @@ filter_linear2 = false scale_type2 = viewport scale2 = 1.0 srgb_framebuffer2 = true +alias2 = "CRTPass" shader3 = shaders/glow/threshold.slang filter_linear3 = false diff --git a/crt/shaders/glow/resolve.slang b/crt/shaders/glow/resolve.slang index 6791dcd..c200920 100644 --- a/crt/shaders/glow/resolve.slang +++ b/crt/shaders/glow/resolve.slang @@ -40,7 +40,6 @@ void main() vec3 source = BLOOM_STRENGTH * texture(Source, vTexCoord).rgb; #else - /* TODO/FIXME - In slang, how do I get the equivalent of PASSPREV4.tex_coord? */ vec3 source = 1.15 * texture(CRT_PASS, vTexCoord).rgb; vec3 bloom = texture(Source, vTexCoord).rgb; source += BLOOM_STRENGTH * bloom;