From faf75698de22fa8ec529619d6dec9542dcf6f850 Mon Sep 17 00:00:00 2001 From: gam0022 Date: Thu, 2 Aug 2018 00:45:58 +0900 Subject: [PATCH 1/2] Call SRGBToLinear in Bloom FragPrefilter Pass --- PostProcessing/Shaders/Builtins/Bloom.shader | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/PostProcessing/Shaders/Builtins/Bloom.shader b/PostProcessing/Shaders/Builtins/Bloom.shader index d53d383c..40505b05 100644 --- a/PostProcessing/Shaders/Builtins/Bloom.shader +++ b/PostProcessing/Shaders/Builtins/Bloom.shader @@ -31,12 +31,22 @@ Shader "Hidden/PostProcessing/Bloom" half4 FragPrefilter13(VaryingsDefault i) : SV_Target { half4 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), i.texcoord, _MainTex_TexelSize.xy); + +#if defined(UNITY_COLORSPACE_GAMMA) + color = SRGBToLinear(color); +#endif + return Prefilter(SafeHDR(color), i.texcoord); } half4 FragPrefilter4(VaryingsDefault i) : SV_Target { half4 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), i.texcoord, _MainTex_TexelSize.xy); + +#if defined(UNITY_COLORSPACE_GAMMA) + color = SRGBToLinear(color); +#endif + return Prefilter(SafeHDR(color), i.texcoord); } From fbfbda809faee9580b8025b03c876e9bf3ac1a32 Mon Sep 17 00:00:00 2001 From: gam0022 Date: Sat, 29 Sep 2018 02:06:01 +0900 Subject: [PATCH 2/2] fix #if style --- PostProcessing/Shaders/Builtins/Bloom.shader | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/PostProcessing/Shaders/Builtins/Bloom.shader b/PostProcessing/Shaders/Builtins/Bloom.shader index d71210d4..c87b36d3 100644 --- a/PostProcessing/Shaders/Builtins/Bloom.shader +++ b/PostProcessing/Shaders/Builtins/Bloom.shader @@ -1,7 +1,7 @@ Shader "Hidden/PostProcessing/Bloom" { HLSLINCLUDE - + #include "../StdLib.hlsl" #include "../Colors.hlsl" #include "../Sampling.hlsl" @@ -31,18 +31,26 @@ Shader "Hidden/PostProcessing/Bloom" half4 FragPrefilter13(VaryingsDefault i) : SV_Target { half4 color = DownsampleBox13Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), i.texcoord, UnityStereoAdjustedTexelSize(_MainTex_TexelSize).xy); -#if defined(UNITY_COLORSPACE_GAMMA) - color = SRGBToLinear(color); -#endif + + #if UNITY_COLORSPACE_GAMMA + { + color = SRGBToLinear(color); + } + #endif + return Prefilter(SafeHDR(color), i.texcoord); } half4 FragPrefilter4(VaryingsDefault i) : SV_Target { half4 color = DownsampleBox4Tap(TEXTURE2D_PARAM(_MainTex, sampler_MainTex), i.texcoord, UnityStereoAdjustedTexelSize(_MainTex_TexelSize).xy); -#if defined(UNITY_COLORSPACE_GAMMA) - color = SRGBToLinear(color); -#endif + + #if UNITY_COLORSPACE_GAMMA + { + color = SRGBToLinear(color); + } + #endif + return Prefilter(SafeHDR(color), i.texcoord); }