diff options
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 |
commit | e97aa6b56d7f884f8e54fb90228ee7de03936680 (patch) | |
tree | ae919019b46fade67b6eb4920d01c2cfc7fd9983 /hlsl/primary.fx | |
parent | 3f0f794c592bdd6944e9043ffec9730773325dc6 (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/primary.fx')
-rw-r--r-- | hlsl/primary.fx | 6 |
1 files changed, 1 insertions, 5 deletions
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; } //----------------------------------------------------------------------------- |