Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Unified Diff: src/gpu/GrDrawState.cpp

Issue 718103003: Relax constraints on src coeff in GrDrawState::willBlendWithDst. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrDrawState.cpp
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 23ebea6afcfd9cbbb4f476edea789b46e21118d4..513c3bf9e9eb7549c8e7d4e11666d947ea5a65b4 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -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 (GrBlendCoeffRefsDst(this->getSrcBlendCoeff())) {
+ return true;
}
- if (kOne_GrBlendCoeff != srcCoeff ||
- kZero_GrBlendCoeff != dstCoeff ||
- this->willEffectReadDstColor()) {
+
+ GrBlendCoeff dstCoeff = this->getDstBlendCoeff();
+ if (!(kZero_GrBlendCoeff == dstCoeff ||
+ (kISA_GrBlendCoeff == dstCoeff && this->srcAlphaWillBeOne()))) {
return true;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698