summaryrefslogtreecommitdiffstatshomepage
path: root/hlsl
diff options
context:
space:
mode:
author Ryan Holtz <rholtz@batcountryentertainment.com>2011-05-24 18:28:54 +0000
committer Ryan Holtz <rholtz@batcountryentertainment.com>2011-05-24 18:28:54 +0000
commite97aa6b56d7f884f8e54fb90228ee7de03936680 (patch)
treeae919019b46fade67b6eb4920d01c2cfc7fd9983 /hlsl
parent3f0f794c592bdd6944e9043ffec9730773325dc6 (diff)
Internal HLSL cleanup - removed aux texcoords, restored software vertex processing due to low-end cards not doing hardware vertex processing, removed unnecessary tristrip->trilist splitting. Restores D3D functionality on integrated chipsets and marginal cards. [Ryan Holtz, Ashura-X]
Diffstat (limited to 'hlsl')
-rw-r--r--hlsl/color.fx4
-rw-r--r--hlsl/deconverge.fx1
-rw-r--r--hlsl/focus.fx1
-rw-r--r--hlsl/phosphor.fx1
-rw-r--r--hlsl/pincushion.fx3
-rw-r--r--hlsl/post.fx6
-rw-r--r--hlsl/primary.fx6
-rw-r--r--hlsl/yiq_decode.fx1
-rw-r--r--hlsl/yiq_encode.fx1
9 files changed, 2 insertions, 22 deletions
diff --git a/hlsl/color.fx b/hlsl/color.fx
index b28fb2c3000..8b618eb325a 100644
--- a/hlsl/color.fx
+++ b/hlsl/color.fx
@@ -24,7 +24,6 @@ struct VS_OUTPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct VS_INPUT
@@ -32,14 +31,12 @@ struct VS_INPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
{
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
//-----------------------------------------------------------------------------
@@ -70,7 +67,6 @@ VS_OUTPUT vs_main(VS_INPUT Input)
Output.Position *= float4(2.0f, 2.0f, 1.0f, 1.0f);
Output.Color = Input.Color;
Output.TexCoord = Input.TexCoord;
- Output.ExtraInfo = Input.ExtraInfo;
return Output;
}
diff --git a/hlsl/deconverge.fx b/hlsl/deconverge.fx
index c5630666918..1a0ccf79592 100644
--- a/hlsl/deconverge.fx
+++ b/hlsl/deconverge.fx
@@ -34,7 +34,6 @@ struct VS_INPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
diff --git a/hlsl/focus.fx b/hlsl/focus.fx
index d84b6b96922..b1b05520b60 100644
--- a/hlsl/focus.fx
+++ b/hlsl/focus.fx
@@ -38,7 +38,6 @@ struct VS_INPUT
float3 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
diff --git a/hlsl/phosphor.fx b/hlsl/phosphor.fx
index 13fc97975b4..6512cc4739a 100644
--- a/hlsl/phosphor.fx
+++ b/hlsl/phosphor.fx
@@ -45,7 +45,6 @@ struct VS_INPUT
float3 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
diff --git a/hlsl/pincushion.fx b/hlsl/pincushion.fx
index 1712a5fa48e..03f4dbc278d 100644
--- a/hlsl/pincushion.fx
+++ b/hlsl/pincushion.fx
@@ -24,7 +24,6 @@ struct VS_OUTPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
float2 RedCoord : TEXCOORD2;
float2 GreenCoord : TEXCOORD3;
float2 BlueCoord : TEXCOORD4;
@@ -35,14 +34,12 @@ struct VS_INPUT
float3 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
{
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
float2 RedCoord : TEXCOORD2;
float2 GreenCoord : TEXCOORD3;
float2 BlueCoord : TEXCOORD4;
diff --git a/hlsl/post.fx b/hlsl/post.fx
index 423bab6d91a..c9bd0f79b04 100644
--- a/hlsl/post.fx
+++ b/hlsl/post.fx
@@ -37,7 +37,6 @@ struct VS_OUTPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct VS_INPUT
@@ -45,14 +44,12 @@ struct VS_INPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
{
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
//-----------------------------------------------------------------------------
@@ -81,7 +78,6 @@ VS_OUTPUT vs_main(VS_INPUT Input)
Output.Position *= float4(2.0f, 2.0f, 1.0f, 1.0f);
Output.Color = Input.Color;
Output.TexCoord = Input.TexCoord + 0.5f / float2(RawWidth, RawHeight);
- Output.ExtraInfo = Input.ExtraInfo;
//float Zoom = 1.0f;
//Output.TexCoord /= Zoom;
@@ -169,7 +165,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
float3 ShadowTexel = lerp(1.0f, tex2D(ShadowSampler, ShadowCoord), UseShadow);
// -- Final Pixel --
- float4 Output = lerp(Input.Color, float4(Scanned * lerp(1.0f, ShadowTexel * 1.25f, ShadowBrightness), BaseTexel.a) * Input.Color, Input.ExtraInfo.x);
+ float4 Output = float4(Scanned * lerp(1.0f, ShadowTexel * 1.25f, ShadowBrightness), BaseTexel.a) * Input.Color;
return Output;
}
diff --git a/hlsl/primary.fx b/hlsl/primary.fx
index cf68638f847..b2f9d0f6826 100644
--- a/hlsl/primary.fx
+++ b/hlsl/primary.fx
@@ -24,7 +24,6 @@ struct VS_OUTPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct VS_INPUT
@@ -32,14 +31,12 @@ struct VS_INPUT
float3 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
{
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
//-----------------------------------------------------------------------------
@@ -64,7 +61,6 @@ VS_OUTPUT vs_main(VS_INPUT Input)
Output.Position *= float4(2.0f, 2.0f, 1.0f, 1.0f);
Output.Color = Input.Color;
Output.TexCoord = lerp(Input.TexCoord, Input.Position.xy / float2(TargetWidth, TargetHeight), PostPass);
- Output.ExtraInfo = Input.ExtraInfo;
return Output;
}
@@ -76,7 +72,7 @@ VS_OUTPUT vs_main(VS_INPUT Input)
float4 ps_main(PS_INPUT Input) : COLOR
{
float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord);
- return lerp(Input.Color, BaseTexel * Input.Color, Input.ExtraInfo.x);
+ return BaseTexel * Input.Color;
}
//-----------------------------------------------------------------------------
diff --git a/hlsl/yiq_decode.fx b/hlsl/yiq_decode.fx
index 813c4cb441e..550a0a83062 100644
--- a/hlsl/yiq_decode.fx
+++ b/hlsl/yiq_decode.fx
@@ -51,7 +51,6 @@ struct VS_INPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT
diff --git a/hlsl/yiq_encode.fx b/hlsl/yiq_encode.fx
index d89097e3032..b8ee1e22de5 100644
--- a/hlsl/yiq_encode.fx
+++ b/hlsl/yiq_encode.fx
@@ -34,7 +34,6 @@ struct VS_INPUT
float4 Position : POSITION;
float4 Color : COLOR0;
float2 TexCoord : TEXCOORD0;
- float2 ExtraInfo : TEXCOORD1;
};
struct PS_INPUT