Bug 823393. Breakage fix for partially commited Bug 823148.

Only some hunks of the patch for bug 823148 made it into the
tree. I've no idea why.

--HG--
extra : rebase_source : 629e6d74e2e6cf4255e7875a8a1eb044241eec23
This commit is contained in:
Jeff Muizelaar 2012-12-20 01:16:45 -05:00
parent 9626204f2b
commit ef84a35a51

View File

@ -1514,7 +1514,7 @@ DrawTargetD2D::GetBlendStateForOperator(CompositionOp aOperator)
ID2D1RenderTarget*
DrawTargetD2D::GetRTForOperation(CompositionOp aOperator, const Pattern &aPattern)
{
if (aOperator == OP_OVER && !IsPatternSupportedByD2D(aPattern)) {
if (aOperator == OP_OVER && IsPatternSupportedByD2D(aPattern)) {
return mRT;
}
@ -1609,7 +1609,7 @@ DrawTargetD2D::FinalizeRTForOperation(CompositionOp aOperator, const Pattern &aP
mPrivateData->mEffect->GetVariableByName("QuadDesc")->AsVector()->
SetFloatVector(ShaderConstantRectD3D10(-1.0f, 1.0f, 2.0f, -2.0f));
if (!IsPatternSupportedByD2D(aPattern)) {
if (IsPatternSupportedByD2D(aPattern)) {
mPrivateData->mEffect->GetVariableByName("TexCoords")->AsVector()->
SetFloatVector(ShaderConstantRectD3D10(0, 0, 1.0f, 1.0f));
mPrivateData->mEffect->GetVariableByName("tex")->AsShaderResource()->SetResource(mSRView);