AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Relax constraints on src coeff in GrDrawState::willBlendWithDst.

Browse Source 
Allow the srcCoeff to be anything as long as it does not reference the dst. Previous version
required srcCoeff to be one.

BUG=skia:

Review URL: https://codereview.chromium.org/718103003
This commit is contained in:
egdaniel 2014-11-13 06:19:25 -08:00 committed by Commit bot
parent ec2d28554a
commit b1cff03325
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gpu/GrDrawState.cpp
View File

@ -7,6 +7,7 @@
#include "GrDrawState.h"
#include "GrBlend.h"
#include "GrInvariantOutput.h"
#include "GrOptDrawState.h"
#include "GrPaint.h"
@ -749,15 +750,17 @@ bool GrDrawState::willBlendWithDst() const {
return true;
}
bool srcAIsOne = this->srcAlphaWillBeOne();
GrBlendCoeff srcCoeff = this->getSrcBlendCoeff();
GrBlendCoeff dstCoeff = this->getDstBlendCoeff();
if (kISA_GrBlendCoeff == dstCoeff && srcAIsOne) {
dstCoeff = kZero_GrBlendCoeff;
if (this->willEffectReadDstColor()) {
return true;
}
if (kOne_GrBlendCoeff != srcCoeff ||
kZero_GrBlendCoeff != dstCoeff ||
this->willEffectReadDstColor()) {
if (GrBlendCoeffRefsDst(this->getSrcBlendCoeff())) {
return true;
}
GrBlendCoeff dstCoeff = this->getDstBlendCoeff();
if (!(kZero_GrBlendCoeff == dstCoeff ||
(kISA_GrBlendCoeff == dstCoeff && this->srcAlphaWillBeOne()))) {
return true;
}