Merge branch 'master' into mg/ssao_fix

Author: TheMostDiligent

PostProcess/Bloom/src/Bloom.cpp

@@ -358,7 +358,7 @@ void Bloom::ComputeUpsampledTextures(const RenderAttributes& RenderAttribs)
                 m_UpsampledTextures[TextureIdx - 1]->GetDefaultView(TEXTURE_VIEW_RENDER_TARGET),
             };
 
-            TextureInputSV.Set(m_DownsampledTextures[TextureIdx]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE));
+            TextureInputSV.Set(m_DownsampledTextures[TextureIdx - 1]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE));
             TextureDowsampledSV.Set(TextureIdx != MipCount ? m_UpsampledTextures[TextureIdx]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE) : m_DownsampledTextures[TextureIdx]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE));
 
             RenderAttribs.pDeviceContext->SetRenderTargets(1, pRTVs, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);

Shaders/PostProcess/Bloom/private/Bloom_ComputeUpsampledTexture.fx

@@ -20,7 +20,7 @@ float3 SampleColor(float2 Texcoord, float2 Offset)
 float3 ComputeUpsampledTexturePS(in FullScreenTriangleVSOutput VSOut) : SV_Target0
 {
     float2 TextureResolution;
-    g_TextureInput.GetDimensions(TextureResolution.x, TextureResolution.y);
+    g_TextureDownsampled.GetDimensions(TextureResolution.x, TextureResolution.y);
 
     float2 TexelSize = rcp(TextureResolution);
     float2 CenterTexcoord = NormalizedDeviceXYToTexUV(VSOut.f2NormalizedXY);