Added function CreateFrom2Procs() in new namespace GrXfermodeFragmentProcessor

src/core/SkComposeShader.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkComposeShader.h"
@@ skipping 178 matching lines @@
 
             result += n;
             x += n;
             count -= n;
         } while (count > 0);
     }
 }
 
 #if SK_SUPPORT_GPU
 
-#include "SkGr.h"
-#include "GrProcessor.h"
 #include "gl/GrGLBlend.h"
 #include "gl/builders/GrGLProgramBuilder.h"
 #include "effects/GrConstColorProcessor.h"
 
 /////////////////////////////////////////////////////////////////////
 
-class GrComposeEffect : public GrFragmentProcessor {
-public:
-
-    static GrFragmentProcessor* Create(const GrFragmentProcessor* fpA,
-                                       const GrFragmentProcessor* fpB, SkXfermode::Mode mode) {
-        return SkNEW_ARGS(GrComposeEffect, (fpA, fpB, mode));
-    }
-    const char* name() const override { return "ComposeShader"; }
-    void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override;
-
-    SkXfermode::Mode getMode() const { return fMode; }
-
-protected:
-    bool onIsEqual(const GrFragmentProcessor&) const override;
-    void onComputeInvariantOutput(GrInvariantOutput* inout) const override;
-
-private:
-    GrComposeEffect(const GrFragmentProcessor* fpA, const GrFragmentProcessor* fpB,
-                    SkXfermode::Mode mode)
-        : fMode(mode) {
-        this->initClassID<GrComposeEffect>();
-        SkDEBUGCODE(int shaderAChildIndex = )this->registerChildProcessor(fpA);
-        SkDEBUGCODE(int shaderBChildIndex = )this->registerChildProcessor(fpB);
-        SkASSERT(0 == shaderAChildIndex);
-        SkASSERT(1 == shaderBChildIndex);
-    }
-
-    GrGLFragmentProcessor* onCreateGLInstance() const override;
-
-    SkXfermode::Mode fMode;
-
-    GR_DECLARE_FRAGMENT_PROCESSOR_TEST;
-
-    typedef GrFragmentProcessor INHERITED;
-};
-
-/////////////////////////////////////////////////////////////////////
-
 class GrGLComposeEffect : public GrGLFragmentProcessor {
 public:
     GrGLComposeEffect(const GrProcessor& processor) {}
 
     void emitCode(EmitArgs&) override;
 
 private:
     typedef GrGLFragmentProcessor INHERITED;
 };
 
@@ skipping 14 matching lines @@
     do {
         fpB.reset(GrProcessorTestFactory<GrFragmentProcessor>::CreateStage(d));
         SkASSERT(fpB);
     } while (fpB->numChildProcessors() != 0);
 
     SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(
             d->fRandom->nextRangeU(0, SkXfermode::kLastCoeffMode));
     return SkNEW_ARGS(GrComposeEffect, (fpA, fpB, mode));
 }
 
+GrComposeEffect::GrComposeEffect(const GrFragmentProcessor* fpA, const GrFragmentProcessor* fpB,
+                                 SkXfermode::Mode mode)
+    : fMode(mode) {
+    SkASSERT(SkXfermode::kLastCoeffMode >= mode);
+    this->initClassID<GrComposeEffect>();
+    SkDEBUGCODE(int shaderAChildIndex = )this->registerChildProcessor(fpA);
+    SkDEBUGCODE(int shaderBChildIndex = )this->registerChildProcessor(fpB);
+    SkASSERT(0 == shaderAChildIndex);
+    SkASSERT(1 == shaderBChildIndex);
+}
+
 bool GrComposeEffect::onIsEqual(const GrFragmentProcessor& other) const {
     const GrComposeEffect& cs = other.cast<GrComposeEffect>();
     return fMode == cs.fMode;
 }
 
 void GrComposeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const {
     inout->setToUnknown(GrInvariantOutput::kWill_ReadInput);
 }
 
 void GrComposeEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const {
@@ skipping 74 matching lines @@
             SkAutoTUnref<const GrFragmentProcessor> fpA(fShaderA->asFragmentProcessor(context,
                                                         viewM, localMatrix, fq, procDataManager));
             if (!fpA.get()) {
                 return nullptr;
             }
             SkAutoTUnref<const GrFragmentProcessor> fpB(fShaderB->asFragmentProcessor(context,
                                                         viewM, localMatrix, fq, procDataManager));
             if (!fpB.get()) {
                 return nullptr;
             }
-            return GrComposeEffect::Create(fpA, fpB, mode);
+            return new GrComposeEffect(fpA, fpB, mode);
     }
 }
 #endif
 
 #ifndef SK_IGNORE_TO_STRING
 void SkComposeShader::toString(SkString* str) const {
     str->append("SkComposeShader: (");
 
     str->append("ShaderA: ");
     fShaderA->toString(str);
     str->append(" ShaderB: ");
     fShaderB->toString(str);
     if (fMode) {
         str->append(" Xfermode: ");
         fMode->toString(str);
     }
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif