asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #62081 from Calinou/glow-mix-mode-apply-after-fxaa

Browse source 
Fix glow in Mix mode not working correctly when FXAA is enabled
This commit is contained in:
Rémi Verschelde 2022-06-16 20:00:32 +02:00 committed by GitHub
commit 285e20d550
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
View file

@ -448,6 +448,11 @@ void main() {
// Early Tonemap & SRGB Conversion // Early Tonemap & SRGB Conversion
#ifndef SUBPASS #ifndef SUBPASS
if (params.use_fxaa) {
// FXAA must be performed before glow to preserve the "bleed" effect of glow.
color.rgb = do_fxaa(color.rgb, exposure, uv_interp);
}
if (params.use_glow && params.glow_mode == GLOW_MODE_MIX) { if (params.use_glow && params.glow_mode == GLOW_MODE_MIX) {
vec3 glow = gather_glow(source_glow, uv_interp) * params.luminance_multiplier; vec3 glow = gather_glow(source_glow, uv_interp) * params.luminance_multiplier;
if (params.glow_map_strength > 0.001) { if (params.glow_map_strength > 0.001) {
@ -455,10 +460,6 @@ void main() {
} }
color.rgb = mix(color.rgb, glow, params.glow_intensity); color.rgb = mix(color.rgb, glow, params.glow_intensity);
} }
if (params.use_fxaa) {
color.rgb = do_fxaa(color.rgb, exposure, uv_interp);
}
#endif #endif
if (params.use_debanding) { if (params.use_debanding) {