[mq]: Backout of 69e4f4ecbdc2

This commit is contained in:
Doug Turner 2011-01-19 20:46:08 -08:00
parent d9f12a52f9
commit d69908e871
2 changed files with 2642 additions and 3594 deletions

View File

@ -41,19 +41,6 @@ BlendState NonPremul
RenderTargetWriteMask[0] = 0x0F; // All
};
BlendState ComponentAlphaBlend
{
AlphaToCoverageEnable = FALSE;
BlendEnable[0] = TRUE;
SrcBlend = One;
DestBlend = Inv_Src1_Color;
BlendOp = Add;
SrcBlendAlpha = Zero;
DestBlendAlpha = One;
BlendOpAlpha = Add;
RenderTargetWriteMask[0] = 0x0F; // All
};
RasterizerState LayerRast
{
ScissorEnable = True;
@ -64,7 +51,6 @@ Texture2D tRGB;
Texture2D tY;
Texture2D tCb;
Texture2D tCr;
Texture2D tRGBWhite;
SamplerState LayerTextureSamplerLinear
{
@ -89,11 +75,6 @@ struct VS_OUTPUT {
float2 vTexCoords : TEXCOORD0;
};
struct PS_OUTPUT {
float4 vSrc;
float4 vAlpha;
};
VS_OUTPUT LayerQuadVS(const VS_INPUT aVertex)
{
VS_OUTPUT outp;
@ -166,17 +147,6 @@ float4 YCbCrShader(const VS_OUTPUT aVertex) : SV_Target
return color * fLayerOpacity;
}
PS_OUTPUT ComponentAlphaShader(const VS_OUTPUT aVertex) : SV_Target
{
PS_OUTPUT result;
result.vSrc = tRGB.Sample(LayerTextureSamplerLinear, aVertex.vTexCoords);
result.vAlpha = 1.0 - tRGBWhite.Sample(LayerTextureSamplerLinear, aVertex.vTexCoords) + result.vSrc;
result.vSrc *= fLayerOpacity;
result.vAlpha *= fLayerOpacity;
return result;
}
float4 SolidColorShader(const VS_OUTPUT aVertex) : SV_Target
{
return fLayerColor;
@ -266,19 +236,6 @@ technique10 RenderYCbCrLayer
}
}
technique10 RenderComponentAlphaLayer
{
Pass P0
{
SetRasterizerState( LayerRast );
SetBlendState( ComponentAlphaBlend, float4( 0.0f, 0.0f, 0.0f, 0.0f ), 0xFFFFFFFF );
SetVertexShader( CompileShader( vs_4_0_level_9_3, LayerQuadVS() ) );
SetGeometryShader( NULL );
SetPixelShader( CompileShader( ps_4_0_level_9_3, ComponentAlphaShader() ) );
}
}
technique10 RenderSolidColorLayer
{
pass P0

File diff suppressed because it is too large Load Diff