diff --git a/WickedEngine/bloomcombineCS.hlsl b/WickedEngine/bloomcombineCS.hlsl index a6513dc13..6c046dcc7 100644 --- a/WickedEngine/bloomcombineCS.hlsl +++ b/WickedEngine/bloomcombineCS.hlsl @@ -2,7 +2,7 @@ #include "ShaderInterop_Postprocess.h" TEXTURE2D(input, float4, TEXSLOT_ONDEMAND0); -TEXTURE2D(bloom, float4, TEXSLOT_ONDEMAND1); +TEXTURE2D(texture_bloom, float3, TEXSLOT_ONDEMAND1); RWTEXTURE2D(output, float4, 0); @@ -11,10 +11,10 @@ void main(uint3 DTid : SV_DispatchThreadID) { const float2 uv = (DTid.xy + 0.5f) * xPPResolution_rcp; - float4 color = input[DTid.xy]; - color.rgb += bloom.SampleLevel(sampler_linear_clamp, uv, 1.5f).rgb; - color.rgb += bloom.SampleLevel(sampler_linear_clamp, uv, 3.5f).rgb; - color.rgb += bloom.SampleLevel(sampler_linear_clamp, uv, 4.5f).rgb; + float3 bloom = texture_bloom.SampleLevel(sampler_linear_clamp, uv, 1.5f); + bloom += texture_bloom.SampleLevel(sampler_linear_clamp, uv, 3.5f); + bloom += texture_bloom.SampleLevel(sampler_linear_clamp, uv, 4.5f); + bloom /= 3.0f; - output[DTid.xy] = color; + output[DTid.xy] = input[DTid.xy] + float4(bloom, 0); } \ No newline at end of file diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 10d2edf76..6b90ba64f 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 38; // minor bug fixes, alterations, refactors, updates - const int revision = 25; + const int revision = 26; long GetVersion()