commit 289efe014ad7628de7cf2c5177a42cacd1e335ad
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 21 20:57:59 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon May 21 20:57:59 2012 +0000
tree 739008c94137e69e153d4d7cda5a52ecff943db5
parent 469d0dd944833444a363591be1ee6a76bdecf96d

Tunnel name requests through factory, forcing custom effect and custom prog stage to use same impl

Review URL: http://codereview.appspot.com/6220061/



git-svn-id: http://skia.googlecode.com/svn/trunk@4019 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/effects/GrConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index 563d1a4..29d1573 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -17,8 +17,8 @@
 
 public:
 
-    GrGLConvolutionEffect(const GrCustomStage* stage);
-    virtual const char* name() const SK_OVERRIDE;
+    GrGLConvolutionEffect(const GrProgramStageFactory& factory,
+                          const GrCustomStage* stage);
     virtual void setupVSUnis(VarArray* vsUnis, int stage) SK_OVERRIDE;
     virtual void setupFSUnis(VarArray* fsUnis, int stage) SK_OVERRIDE;
     virtual void emitVS(GrStringBuilder* code,
@@ -49,18 +49,17 @@
     typedef GrGLProgramStage INHERITED;
 };
 
-GrGLConvolutionEffect::GrGLConvolutionEffect(const GrCustomStage* data)
-    : fKernelVar(NULL)
+GrGLConvolutionEffect::GrGLConvolutionEffect(
+                                    const GrProgramStageFactory& factory,
+                                    const GrCustomStage* data)
+    : GrGLProgramStage(factory)
+    , fKernelVar(NULL)
     , fImageIncrementVar(NULL)
     , fKernelLocation(0)
     , fImageIncrementLocation(0) {
     fKernelWidth = static_cast<const GrConvolutionEffect*>(data)->width();
 }
 
-const char* GrGLConvolutionEffect::name() const {
-    return GrConvolutionEffect::Name();
-}
-
 void GrGLConvolutionEffect::setupVSUnis(VarArray* vsUnis,
                                         int stage) {
     fImageIncrementVar = &vsUnis->push_back();
@@ -188,11 +187,6 @@
 
 }
 
-const char* GrConvolutionEffect::name() const {
-    return Name();
-}
-
-
 const GrProgramStageFactory& GrConvolutionEffect::getFactory() const {
     return GrTProgramStageFactory<GrConvolutionEffect>::getInstance();
 }