commit 915187b71d4068f21a15a1b8f4d919e1179d8b74
author egdaniel <egdaniel@google.com> Fri Dec 05 12:58:28 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Dec 05 12:58:28 2014 -0800
tree 1684cbdaab23d89a9682dce3f3d7604440e5daf5
parent e78f11e9b1cfc212284db2c06a2b465e4aeccec0

Check XpFactory equality in DrawState

BUG=skia:

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

src/gpu/GrDrawState.cpp

diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index db70bfa..8c2d75f 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -51,6 +51,10 @@
         return false;
     }
 
+    if (!this->getXPFactory()->isEqual(*that.getXPFactory())) {
+        return false;
+    }
+
     for (int i = 0; i < this->numColorStages(); i++) {
         if (!GrFragmentStage::AreCompatible(this->getColorStage(i), that.getColorStage(i),
                                              explicitLocalCoords)) {

src/gpu/GrProcessor.cpp

diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 810c751..96dd9ea 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -11,6 +11,7 @@
 #include "GrGeometryData.h"
 #include "GrInvariantOutput.h"
 #include "GrMemoryPool.h"
+#include "GrXferProcessor.h"
 #include "SkTLS.h"
 
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
@@ -179,3 +180,10 @@
 void GrGeometryData::operator delete(void* target) {
     GrProcessor_Globals::GetTLS()->release(target);
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// Initial static variable from GrXPFactory
+int32_t GrXPFactory::gCurrXPFClassID =
+        GrXPFactory::kIllegalXPFClassID;
+

src/gpu/effects/GrPorterDuffXferProcessor.cpp

diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 04a7b1f..55e0c93 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -65,6 +65,11 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+GrPorterDuffXPFactory::GrPorterDuffXPFactory(GrBlendCoeff src, GrBlendCoeff dst)
+    : fSrc(src), fDst(dst) {
+    this->initClassID<GrPorterDuffXPFactory>();
+}
+
 GrXPFactory* GrPorterDuffXPFactory::Create(SkXfermode::Mode mode) {
     switch (mode) {
         case SkXfermode::kClear_Mode: {