commit 378092f3d10b1dd62967f419c35cfefec7c10ee7
author egdaniel <egdaniel@google.com> Wed Dec 03 10:40:13 2014 -0800
committer Commit bot <commit-bot@chromium.org> Wed Dec 03 10:40:13 2014 -0800
tree 2053505fc4cccddb5a366ef26897128b2a65b0cd
parent 5ab7e80f2b477c55be9861ab1c56e33e19aa97a6

Add XferProcessor factory in GrPaint and GrDrawState.

In this CL the XP should have zero effect on the actual rendering pipeline.

BUG=skia:

Review URL: https://codereview.chromium.org/751283002

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index d71b05a..dadf9f2 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -6,15 +6,18 @@
  */
 
 #include "SkGr.h"
+
+#include "GrDrawTargetCaps.h"
+#include "GrGpu.h"
+#include "GrXferProcessor.h"
 #include "SkColorFilter.h"
 #include "SkConfig8888.h"
 #include "SkData.h"
 #include "SkMessageBus.h"
 #include "SkPixelRef.h"
 #include "SkTextureCompressor.h"
-#include "GrGpu.h"
 #include "effects/GrDitherEffect.h"
-#include "GrDrawTargetCaps.h"
+#include "effects/GrPorterDuffXferProcessor.h"
 #include "effects/GrYUVtoRGBEffect.h"
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
@@ -465,19 +468,27 @@
     SkXfermode::Coeff dm;
 
     SkXfermode* mode = skPaint.getXfermode();
-    GrFragmentProcessor* xferProcessor = NULL;
-    if (SkXfermode::asFragmentProcessorOrCoeff(mode, &xferProcessor, &sm, &dm)) {
-        if (xferProcessor) {
-            grPaint->addColorProcessor(xferProcessor)->unref();
+    GrFragmentProcessor* fragmentProcessor = NULL;
+    GrXPFactory* xpFactory = NULL;
+    if (SkXfermode::AsFragmentProcessorOrXPFactory(mode, &fragmentProcessor, &xpFactory,
+                                                   &sm, &dm)) {
+        if (fragmentProcessor) {
+            SkASSERT(NULL == xpFactory);
+            grPaint->addColorProcessor(fragmentProcessor)->unref();
+            xpFactory = GrPorterDuffXPFactory::Create(SkXfermode::kOne_Coeff,
+                                                      SkXfermode::kZero_Coeff);
             sm = SkXfermode::kOne_Coeff;
             dm = SkXfermode::kZero_Coeff;
         }
     } else {
-        //SkDEBUGCODE(SkDebugf("Unsupported xfer mode.\n");)
         // Fall back to src-over
+        xpFactory = GrPorterDuffXPFactory::Create(SkXfermode::kOne_Coeff,
+                                                  SkXfermode::kISA_Coeff);
         sm = SkXfermode::kOne_Coeff;
         dm = SkXfermode::kISA_Coeff;
     }
+    SkASSERT(xpFactory);
+    grPaint->setXPFactory(xpFactory)->unref();
     grPaint->setBlendFunc(sk_blend_to_grblend(sm), sk_blend_to_grblend(dm));
 
     //set the color of the paint to the one of the parameter