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

Unified Diff: src/core/SkXfermode.cpp

Issue 751283002: Add XferProcessor factory in GrPaint and GrDrawState. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix comiple bug Created 6 years 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 | « include/gpu/GrXferProcessor.h ('k') | src/gpu/GrBitmapTextContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkXfermode.cpp
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index e0abb4ebdd8f735a3410ef521122f538991843d1..ef44b1e747d927a2e5b22f87824e5dda44c88c76 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -6,7 +6,6 @@
* found in the LICENSE file.
*/
-
#include "SkXfermode.h"
#include "SkXfermode_opts_SSE2.h"
#include "SkXfermode_proccoeff.h"
@@ -680,16 +679,41 @@ bool SkXfermode::asFragmentProcessor(GrFragmentProcessor**, GrTexture*) const {
return false;
}
-bool SkXfermode::asFragmentProcessorOrCoeff(SkXfermode* xfermode, GrFragmentProcessor** fp,
- Coeff* src, Coeff* dst, GrTexture* background) {
+bool SkXfermode::asXPFactory(GrXPFactory**) const {
+ return false;
+}
+
+
+#if SK_SUPPORT_GPU
+#include "effects/GrPorterDuffXferProcessor.h"
+
+bool SkXfermode::AsFragmentProcessorOrXPFactory(SkXfermode* xfermode,
+ GrFragmentProcessor** fp,
+ GrXPFactory** xpf,
+ Coeff* src, Coeff* dst) {
if (NULL == xfermode) {
- return ModeAsCoeff(kSrcOver_Mode, src, dst);
+ SkAssertResult(ModeAsCoeff(kSrcOver_Mode, src, dst));
+ *xpf = GrPorterDuffXPFactory::Create(*src, *dst);
+ return true;
} else if (xfermode->asCoeff(src, dst)) {
+ *xpf = GrPorterDuffXPFactory::Create(*src, *dst);
+ return true;
+ } else if (xfermode->asXPFactory(xpf)) {
+ *src = SkXfermode::kOne_Coeff;
+ *dst = SkXfermode::kZero_Coeff;
return true;
} else {
- return xfermode->asFragmentProcessor(fp, background);
+ return xfermode->asFragmentProcessor(fp);
}
}
+#else
+bool SkXfermode::AsFragmentProcessorOrXPFactory(SkXfermode* xfermode,
+ GrFragmentProcessor** fp,
+ GrXPFactory** xpf,
+ Coeff* src, Coeff* dst) {
+ return false;
+}
+#endif
SkPMColor SkXfermode::xferColor(SkPMColor src, SkPMColor dst) const{
// no-op. subclasses should override this
« no previous file with comments | « include/gpu/GrXferProcessor.h ('k') | src/gpu/GrBitmapTextContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698