Bye bye processor data manager

gm/dcshader.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #if SK_SUPPORT_GPU
@@ skipping 19 matching lines @@
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(DCShader);
 
     void flatten(SkWriteBuffer& buf) const override {
         buf.writeMatrix(fDeviceMatrix);
     }
 
     const GrFragmentProcessor* asFragmentProcessor(GrContext*,
                                                    const SkMatrix& viewM,
                                                    const SkMatrix* localMatrix,
-                                                   SkFilterQuality,
-                                                   GrProcessorDataManager*) const override;
+                                                   SkFilterQuality) const override;
 
 #ifndef SK_IGNORE_TO_STRING
     void toString(SkString* str) const override {
         str->appendf("DCShader: ()");
     }
 #endif
 
 private:
     const SkMatrix fDeviceMatrix;
 };
 
 SkFlattenable* DCShader::CreateProc(SkReadBuffer& buf) {
     SkMatrix matrix;
     buf.readMatrix(&matrix);
     return new DCShader(matrix);
 }
 
 class DCFP : public GrFragmentProcessor {
 public:
-    DCFP(GrProcessorDataManager*, const SkMatrix& m) : fDeviceTransform(kDevice_GrCoordSet, m) {
+    DCFP(const SkMatrix& m) : fDeviceTransform(kDevice_GrCoordSet, m) {
         this->addCoordTransform(&fDeviceTransform);
         this->initClassID<DCFP>();
     }
 
     GrGLFragmentProcessor* onCreateGLInstance() const override {
         class DCGLFP : public GrGLFragmentProcessor {
             void emitCode(EmitArgs& args) override {
                 GrGLFragmentBuilder* fpb = args.fBuilder->getFragmentShaderBuilder();
                 fpb->codeAppendf("vec2 c = %s;", fpb->ensureFSCoords2D(args.fCoords, 0).c_str());
                 fpb->codeAppend("vec2 r = mod(c, vec2(20.0));");
@@ skipping 18 matching lines @@
 
 private:
     void onGetGLProcessorKey(const GrGLSLCaps& caps,
                              GrProcessorKeyBuilder* b) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
     GrCoordTransform fDeviceTransform;
 };
 
-const GrFragmentProcessor* DCShader::asFragmentProcessor(
-                                                 GrContext*,
-                                                 const SkMatrix& viewM,
-                                                 const SkMatrix* localMatrix,
-                                                 SkFilterQuality,
-                                                 GrProcessorDataManager* procDataManager) const {
-    SkAutoTUnref<const GrFragmentProcessor> inner(new DCFP(procDataManager, fDeviceMatrix));
+const GrFragmentProcessor* DCShader::asFragmentProcessor(GrContext*,
+                                                         const SkMatrix& viewM,
+                                                         const SkMatrix* localMatrix,
+                                                         SkFilterQuality) const {
+    SkAutoTUnref<const GrFragmentProcessor> inner(new DCFP(fDeviceMatrix));
     return GrFragmentProcessor::MulOutputByInputAlpha(inner);
 }
 
 class DCShaderGM : public GM {
 public:
     DCShaderGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFAABBCC));
     }
 
     ~DCShaderGM() override {
@@ skipping 174 matching lines @@
     };
 
     SkTArray<Prim*> fPrims;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new DCShaderGM;)
 }
 #endif