summaryrefslogtreecommitdiffstatshomepage
path: root/hlsl
diff options
context:
space:
mode:
authorGravatarGravatar Ryan Holtz <rholtz@batcountryentertainment.com>2011-05-21 07:51:50 +0000
committerGravatarGravatar Ryan Holtz <rholtz@batcountryentertainment.com>2011-05-21 07:51:50 +0000
commit76962a2081b96dab9a5cdde4fbc873a841398c4d (patch)
treefbce5ccbcfdc4d9a221020f32bc101649b5816b0 /hlsl
parenta47bd09534ffb9e6a4165806fe5bf0859ab6b014 (diff)
Dot crawl tweak. nw
Diffstat (limited to 'hlsl')
-rw-r--r--hlsl/yiq_decode.fx55
-rw-r--r--hlsl/yiq_encode.fx8
2 files changed, 45 insertions, 18 deletions
diff --git a/hlsl/yiq_decode.fx b/hlsl/yiq_decode.fx
index 4419e9b2469..786e9c549c6 100644
--- a/hlsl/yiq_decode.fx
+++ b/hlsl/yiq_decode.fx
@@ -77,12 +77,18 @@ VS_OUTPUT vs_main(VS_INPUT Input)
Output.Position.y -= 0.5f;
Output.Position *= float4(2.0f, 2.0f, 1.0f, 1.0f);
Output.Color = Input.Color;
- Output.Coord0.xy = Input.TexCoord + float2(-0.625f / RawWidth, 0.0f);
- Output.Coord1.xy = Input.TexCoord + float2(-0.375f / RawWidth, 0.0f);
- Output.Coord2.xy = Input.TexCoord + float2(-0.125f / RawWidth, 0.0f);
- Output.Coord3.xy = Input.TexCoord + float2(0.125f / RawWidth, 0.0f);
- Output.Coord4.xy = Input.TexCoord + float2(0.375f / RawWidth, 0.0f);
- Output.Coord5.xy = Input.TexCoord + float2(0.625f / RawWidth, 0.0f);
+ Output.Coord0.xy = Input.TexCoord + float2(0.00f / RawWidth, 0.0f);
+ Output.Coord1.xy = Input.TexCoord + float2(0.25f / RawWidth, 0.0f);
+ Output.Coord2.xy = Input.TexCoord + float2(0.50f / RawWidth, 0.0f);
+ Output.Coord3.xy = Input.TexCoord + float2(0.75f / RawWidth, 0.0f);
+ Output.Coord4.xy = Input.TexCoord + float2(1.00f / RawWidth, 0.0f);
+ Output.Coord5.xy = Input.TexCoord + float2(1.25f / RawWidth, 0.0f);
+ Output.Coord0.zw = Input.TexCoord + float2(-0.25f / RawWidth, 0.0f);
+ Output.Coord1.zw = Input.TexCoord + float2(-0.50f / RawWidth, 0.0f);
+ Output.Coord2.zw = Input.TexCoord + float2(-0.75f / RawWidth, 0.0f);
+ Output.Coord3.zw = Input.TexCoord + float2(-1.00f / RawWidth, 0.0f);
+ Output.Coord4.zw = Input.TexCoord + float2(-1.25f / RawWidth, 0.0f);
+ Output.Coord5.zw = Input.TexCoord + float2(-1.55f / RawWidth, 0.0f);
return Output;
}
@@ -103,9 +109,11 @@ float4 ps_main(PS_INPUT Input) : COLOR
{
float2 RawDims = float2(RawWidth, RawHeight);
float4 OrigC = tex2D(DiffuseSampler, Input.Coord0.xy);
- float2 OrigC2 = tex2D(DiffuseSampler, Input.Coord4.xy);
+ float4 OrigC2 = tex2D(DiffuseSampler, Input.Coord4.xy);
+ float4 OrigC3 = tex2D(DiffuseSampler, Input.Coord2.zw);
float4 C = OrigC;
- float2 C2 = OrigC2;
+ float4 C2 = OrigC2;
+ float4 C3 = OrigC3;
float MaxC = 2.1183f;
float MinC = -1.1183f;
@@ -113,6 +121,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
C = C * CRange + MinC;
C2 = C2 * CRange + MinC;
+ C3 = C3 * CRange + MinC;
float2 Coord0 = Input.Coord0.xy * RawDims;
float2 Coord1 = Input.Coord1.xy * RawDims;
@@ -121,6 +130,13 @@ float4 ps_main(PS_INPUT Input) : COLOR
float2 Coord4 = Input.Coord4.xy * RawDims;
float2 Coord5 = Input.Coord5.xy * RawDims;
+ float2 Coord6 = Input.Coord0.zw * RawDims;
+ float2 Coord7 = Input.Coord1.zw * RawDims;
+ float2 Coord8 = Input.Coord2.zw * RawDims;
+ float2 Coord9 = Input.Coord3.zw * RawDims;
+ float2 CoordA = Input.Coord4.zw * RawDims;
+ float2 CoordB = Input.Coord5.zw * RawDims;
+
float W = WValue;
float T0 = Coord0.x + AValue * Coord0.y + BValue;
float T1 = Coord1.x + AValue * Coord1.y + BValue;
@@ -128,18 +144,29 @@ float4 ps_main(PS_INPUT Input) : COLOR
float T3 = Coord3.x + AValue * Coord3.y + BValue;
float T4 = Coord4.x + AValue * Coord4.y + BValue;
float T5 = Coord5.x + AValue * Coord5.y + BValue;
+ float T6 = Coord6.x + AValue * Coord6.y + BValue;
+ float T7 = Coord7.x + AValue * Coord7.y + BValue;
+ float T8 = Coord8.x + AValue * Coord8.y + BValue;
+ float T9 = Coord9.x + AValue * Coord9.y + BValue;
+ float TA = CoordA.x + AValue * CoordA.y + BValue;
+ float TB = CoordB.x + AValue * CoordB.y + BValue;
float4 Tc = float4(T0, T1, T2, T3);
- float2 Tc2 = float2(T4, T5);
+ float4 Tc2 = float4(T4, T5, T6, T7);
+ float4 Tc3 = float4(T8, T9, TA, TB);
- float Y = (C.r + C.g + C.b + C.a + C2.r + C2.g) / 6.0f;
+ float Y = (C.r + C.g + C.b + C.a + C2.r + C2.g) / 6.0f;// + C2.a + C3.r + C3.g + C3.b + C3.a) / 12.0f;
- float4 I = C * sin(W * Tc);
- float4 Q = C * cos(W * Tc);
- float2 I2 = C2 * sin(W * Tc2);
- float2 Q2 = C2 * cos(W * Tc2);
+ float4 I = (C - Y) * sin(W * Tc);
+ float4 Q = (C - Y) * cos(W * Tc);
+ float4 I2 = (C2 - Y) * sin(W * Tc2);
+ float4 Q2 = (C2 - Y) * cos(W * Tc2);
+ float4 I3 = (C3 - Y) * sin(W * Tc3);
+ float4 Q3 = (C3 - Y) * cos(W * Tc3);
float Iavg = (I.r + I.g + I.b + I.a + I2.r + I2.g) / 3.0f;
float Qavg = (Q.r + Q.g + Q.b + Q.a + Q2.r + Q2.g) / 3.0f;
+ float Iavg2 = (I2.b + I2.a + I3.r + I3.g + I3.b + I3.a) / 3.0f;
+ float Qavg2 = (Q2.b + Q2.a + Q3.r + Q3.g + Q3.b + Q3.a) / 3.0f;
float3 YIQ = float3(Y, Iavg, Qavg);
diff --git a/hlsl/yiq_encode.fx b/hlsl/yiq_encode.fx
index 2036ccef8fe..98c1d3a17fe 100644
--- a/hlsl/yiq_encode.fx
+++ b/hlsl/yiq_encode.fx
@@ -107,10 +107,10 @@ float4 ps_main(PS_INPUT Input) : COLOR
float2 Coord3 = Input.Coord3.xy * Scaler;
float W = WValue;
- float T0 = Coord0.x + AValue * Coord0.y + BValue - 1.1f;
- float T1 = Coord1.x + AValue * Coord1.y + BValue - 1.1f;
- float T2 = Coord2.x + AValue * Coord2.y + BValue - 1.1f;
- float T3 = Coord3.x + AValue * Coord3.y + BValue - 1.1f;
+ float T0 = Coord0.x + AValue * Coord0.y + BValue;// - 1.1f;
+ float T1 = Coord1.x + AValue * Coord1.y + BValue;// - 1.1f;
+ float T2 = Coord2.x + AValue * Coord2.y + BValue;// - 1.1f;
+ float T3 = Coord3.x + AValue * Coord3.y + BValue;// - 1.1f;
float Y0 = dot(Texel0, float3(0.299f, 0.587f, 0.114f));
float I0 = dot(Texel0, float3(0.595716f, -0.274453f, -0.321263f));