Merge pull request #20 from rz5/master

(crtglow) All presets now correctly alias gaus_vert.slang as 'CRTPass'
This commit is contained in:
hizzlekizzle 2016-07-26 19:51:32 -05:00 committed by GitHub
commit 0e21ee8362
3 changed files with 2 additions and 1 deletions

View file

@ -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

View file

@ -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

View file

@ -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;