aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects/GrCustomXfermode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu/effects/GrCustomXfermode.cpp')
-rw-r--r--src/gpu/effects/GrCustomXfermode.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index e7023ca25d..761e177015 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -459,8 +459,6 @@ public:
emit_custom_xfermode_code(mode, fsBuilder, args.fOutputColor, args.fInputColor, dstColor);
}
- void setData(const GrGLProgramDataManager&, const GrProcessor&) override {}
-
static void GenKey(const GrFragmentProcessor& proc, const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
// The background may come from the dst or from a texture.
uint32_t key = proc.numTextures();
@@ -469,6 +467,9 @@ public:
b->add32(key);
}
+protected:
+ void onSetData(const GrGLProgramDataManager&, const GrProcessor&) override {}
+
private:
typedef GrGLFragmentProcessor INHERITED;
};
@@ -491,7 +492,7 @@ void GrCustomXferFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyB
GLCustomXferFP::GenKey(*this, caps, b);
}
-GrGLFragmentProcessor* GrCustomXferFP::createGLInstance() const {
+GrGLFragmentProcessor* GrCustomXferFP::onCreateGLInstance() const {
return SkNEW_ARGS(GLCustomXferFP, (*this));
}
@@ -625,7 +626,7 @@ private:
void onSetData(const GrGLProgramDataManager&, const GrXferProcessor&) override {}
- typedef GrGLFragmentProcessor INHERITED;
+ typedef GrGLXferProcessor INHERITED;
};
///////////////////////////////////////////////////////////////////////////////