diff options
author | Ryan Holtz <rholtz@batcountryentertainment.com> | 2011-05-28 00:49:22 +0000 |
---|---|---|
committer | Ryan Holtz <rholtz@batcountryentertainment.com> | 2011-05-28 00:49:22 +0000 |
commit | 59d38593e8d317236af9702cb1607abdbef0cad8 (patch) | |
tree | 3e06d38576387894bf4c2dd50a3d5b4839b976da /hlsl/deconverge.fx | |
parent | 3e437e09f04166aac3b9e6aa60ae4ea7865cccda (diff) |
MAMETesters bugs fixed:
- 04361: all: When using HLSL screen size not correct
nwn: Frickin' finally...
Diffstat (limited to 'hlsl/deconverge.fx')
-rw-r--r-- | hlsl/deconverge.fx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/hlsl/deconverge.fx b/hlsl/deconverge.fx index 91c40cb999a..e2e72eb3700 100644 --- a/hlsl/deconverge.fx +++ b/hlsl/deconverge.fx @@ -124,22 +124,22 @@ float4 ps_main(PS_INPUT Input) : COLOR GrnCoord.y = GrnCoord.y - frac(GrnCoord.y); BluCoord.y = BluCoord.y - frac(BluCoord.y); - float RedTexel = tex2D(DiffuseSampler, lerp(TexCoord, RedCoord, Deconverge) / RawDims + 0.5f / float2(RawWidth, RawHeight)).r; - float GrnTexel = tex2D(DiffuseSampler, lerp(TexCoord, GrnCoord, Deconverge) / RawDims + 0.5f / float2(RawWidth, RawHeight)).g; - float BluTexel = tex2D(DiffuseSampler, lerp(TexCoord, BluCoord, Deconverge) / RawDims + 0.5f / float2(RawWidth, RawHeight)).b; + float RedTexel = tex2D(DiffuseSampler, lerp(TexCoord, RedCoord, Deconverge) / RawDims + 0.5f / RawDims).r; + float GrnTexel = tex2D(DiffuseSampler, lerp(TexCoord, GrnCoord, Deconverge) / RawDims + 0.5f / RawDims).g; + float BluTexel = tex2D(DiffuseSampler, lerp(TexCoord, BluCoord, Deconverge) / RawDims + 0.5f / RawDims).b; - RedTexel *= Input.RedCoord.x < (1.0f / TargetWidth) ? 0.0f : 1.0f; - RedTexel *= Input.RedCoord.y < (1.0f / TargetHeight) ? 0.0f : 1.0f; - RedTexel *= Input.RedCoord.x > (1.0f / WidthRatio) ? 0.0f : 1.0f; - RedTexel *= Input.RedCoord.y > (1.0f / HeightRatio) ? 0.0f : 1.0f; - GrnTexel *= Input.GrnCoord.x < (1.0f / TargetWidth) ? 0.0f : 1.0f; - GrnTexel *= Input.GrnCoord.y < (1.0f / TargetHeight) ? 0.0f : 1.0f; - GrnTexel *= Input.GrnCoord.x > (1.0f / WidthRatio) ? 0.0f : 1.0f; - GrnTexel *= Input.GrnCoord.y > (1.0f / HeightRatio) ? 0.0f : 1.0f; - BluTexel *= Input.BluCoord.x < (1.0f / TargetWidth) ? 0.0f : 1.0f; - BluTexel *= Input.BluCoord.y < (1.0f / TargetHeight) ? 0.0f : 1.0f; - BluTexel *= Input.BluCoord.x > (1.0f / WidthRatio) ? 0.0f : 1.0f; - BluTexel *= Input.BluCoord.y > (1.0f / HeightRatio) ? 0.0f : 1.0f; + //RedTexel *= Input.RedCoord.x < (1.0f / TargetWidth) ? 0.0f : 1.0f; + //RedTexel *= Input.RedCoord.y < (1.0f / TargetHeight) ? 0.0f : 1.0f; + //RedTexel *= Input.RedCoord.x > (1.0f / WidthRatio) ? 0.0f : 1.0f; + //RedTexel *= Input.RedCoord.y > (1.0f / HeightRatio) ? 0.0f : 1.0f; + //GrnTexel *= Input.GrnCoord.x < (1.0f / TargetWidth) ? 0.0f : 1.0f; + //GrnTexel *= Input.GrnCoord.y < (1.0f / TargetHeight) ? 0.0f : 1.0f; + //GrnTexel *= Input.GrnCoord.x > (1.0f / WidthRatio) ? 0.0f : 1.0f; + //GrnTexel *= Input.GrnCoord.y > (1.0f / HeightRatio) ? 0.0f : 1.0f; + //BluTexel *= Input.BluCoord.x < (1.0f / TargetWidth) ? 0.0f : 1.0f; + //BluTexel *= Input.BluCoord.y < (1.0f / TargetHeight) ? 0.0f : 1.0f; + //BluTexel *= Input.BluCoord.x > (1.0f / WidthRatio) ? 0.0f : 1.0f; + //BluTexel *= Input.BluCoord.y > (1.0f / HeightRatio) ? 0.0f : 1.0f; return float4(RedTexel, GrnTexel, BluTexel, Alpha); } |