From daa3ae3b10e86f64dcbcbe4d4e4073c61f04fe12 Mon Sep 17 00:00:00 2001 From: Ryan Holtz Date: Mon, 20 May 2013 01:20:22 +0000 Subject: fix incorrect bloom functionality in fullscreen mode, nw --- hlsl/downsample.fx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'hlsl/downsample.fx') diff --git a/hlsl/downsample.fx b/hlsl/downsample.fx index 9dcaf7b90a0..9790af2b4a5 100644 --- a/hlsl/downsample.fx +++ b/hlsl/downsample.fx @@ -45,8 +45,10 @@ struct PS_INPUT // Downsample Vertex Shader //----------------------------------------------------------------------------- +uniform float2 ScreenSize; uniform float2 TargetSize; uniform float2 SourceSize; +uniform float2 PrimRatio; uniform float BloomRescale; VS_OUTPUT vs_main(VS_INPUT Input) @@ -54,16 +56,16 @@ VS_OUTPUT vs_main(VS_INPUT Input) VS_OUTPUT Output = (VS_OUTPUT)0; Output.Position = float4(Input.Position.xyz, 1.0f); - Output.Position.xy /= SourceSize; + Output.Position.xy /= ScreenSize; Output.Position.y = 1.0f - Output.Position.y; - Output.Position.xy -= 0.5f; - Output.Position.xy *= 2.0f; + Output.Position.xy -= float2(0.5f, 0.5f); + Output.Position.xy *= float2(2.0f, 2.0f); Output.Color = Input.Color; - float2 inversePixel = 1.0f / SourceSize; - Output.TexCoord01.xy = Input.Position.xy * inversePixel + float2(0.5f, 0.5f) * inversePixel; - Output.TexCoord01.zw = Input.Position.xy * inversePixel + float2(1.5f, 0.5f) * inversePixel; - Output.TexCoord23.xy = Input.Position.xy * inversePixel + float2(0.5f, 1.5f) * inversePixel; - Output.TexCoord23.zw = Input.Position.xy * inversePixel + float2(1.5f, 1.5f) * inversePixel; + float2 inversePixel = 1.0f / ScreenSize; + Output.TexCoord01.xy = Input.Position.xy / ScreenSize + float2(0.5f, 0.5f) / TargetSize; + Output.TexCoord01.zw = Input.Position.xy / ScreenSize + float2(1.5f, 0.5f) / TargetSize; + Output.TexCoord23.xy = Input.Position.xy / ScreenSize + float2(0.5f, 1.5f) / TargetSize; + Output.TexCoord23.zw = Input.Position.xy / ScreenSize + float2(1.5f, 1.5f) / TargetSize; return Output; } -- cgit v1.2.3-70-g09d2