diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrGradientEffects.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrMorphologyEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgramStage.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgramStage.h | 1 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL_program.cpp | 3 |
6 files changed, 12 insertions, 1 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 4970d6270d..33f61b6ab6 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -29,6 +29,7 @@ public: virtual void setData(const GrGLInterface*, const GrCustomStage&, + const GrRenderTarget*, int stageNum) SK_OVERRIDE; static inline StageKey GenKey(const GrCustomStage&); @@ -118,6 +119,7 @@ void GrGLConvolutionEffect::initUniforms(const GrGLInterface* gl, void GrGLConvolutionEffect::setData(const GrGLInterface* gl, const GrCustomStage& data, + const GrRenderTarget*, int stageNum) { const GrConvolutionEffect& conv = static_cast<const GrConvolutionEffect&>(data); diff --git a/src/gpu/effects/GrGradientEffects.cpp b/src/gpu/effects/GrGradientEffects.cpp index d4719b3a24..3125657af2 100644 --- a/src/gpu/effects/GrGradientEffects.cpp +++ b/src/gpu/effects/GrGradientEffects.cpp @@ -88,6 +88,7 @@ public: virtual void initUniforms(const GrGLInterface*, int programID) SK_OVERRIDE; virtual void setData(const GrGLInterface*, const GrCustomStage&, + const GrRenderTarget*, int stageNum) SK_OVERRIDE; static StageKey GenKey(const GrCustomStage& s) { @@ -258,6 +259,7 @@ void GrGLRadial2Gradient::initUniforms(const GrGLInterface* gl, int programID) { void GrGLRadial2Gradient::setData(const GrGLInterface* gl, const GrCustomStage& baseData, + const GrRenderTarget*, int stageNum) { const GrRadial2Gradient& data = static_cast<const GrRadial2Gradient&>(baseData); @@ -344,6 +346,7 @@ public: virtual void initUniforms(const GrGLInterface*, int programID) SK_OVERRIDE; virtual void setData(const GrGLInterface*, const GrCustomStage&, + const GrRenderTarget*, int stageNum) SK_OVERRIDE; static StageKey GenKey(const GrCustomStage& s) { @@ -573,6 +576,7 @@ void GrGLConical2Gradient::initUniforms(const GrGLInterface* gl, int programID) void GrGLConical2Gradient::setData(const GrGLInterface* gl, const GrCustomStage& baseData, + const GrRenderTarget*, int stageNum) { const GrConical2Gradient& data = static_cast<const GrConical2Gradient&>(baseData); diff --git a/src/gpu/effects/GrMorphologyEffect.cpp b/src/gpu/effects/GrMorphologyEffect.cpp index 3ea2cbd125..180b5eb3a6 100644 --- a/src/gpu/effects/GrMorphologyEffect.cpp +++ b/src/gpu/effects/GrMorphologyEffect.cpp @@ -32,6 +32,7 @@ public: virtual void initUniforms(const GrGLInterface*, int programID) SK_OVERRIDE; virtual void setData(const GrGLInterface*, const GrCustomStage&, + const GrRenderTarget*, int stageNum) SK_OVERRIDE; private: @@ -124,6 +125,7 @@ GrGLProgramStage::StageKey GrGLMorphologyEffect::GenKey( void GrGLMorphologyEffect ::setData(const GrGLInterface* gl, const GrCustomStage& data, + const GrRenderTarget*, int stageNum) { const Gr1DKernelEffect& kern = static_cast<const Gr1DKernelEffect&>(data); diff --git a/src/gpu/gl/GrGLProgramStage.cpp b/src/gpu/gl/GrGLProgramStage.cpp index b5e4f4068c..c1d4942015 100644 --- a/src/gpu/gl/GrGLProgramStage.cpp +++ b/src/gpu/gl/GrGLProgramStage.cpp @@ -27,6 +27,7 @@ void GrGLProgramStage::initUniforms(const GrGLInterface*, int progID) { void GrGLProgramStage::setData(const GrGLInterface*, const GrCustomStage&, + const GrRenderTarget*, int stageNum) { } diff --git a/src/gpu/gl/GrGLProgramStage.h b/src/gpu/gl/GrGLProgramStage.h index 9cf2c1aa97..d5c79b4f65 100644 --- a/src/gpu/gl/GrGLProgramStage.h +++ b/src/gpu/gl/GrGLProgramStage.h @@ -83,6 +83,7 @@ public: created in emit*(). */ virtual void setData(const GrGLInterface* gl, const GrCustomStage& stage, + const GrRenderTarget* renderTarget, int stageNum); const char* name() const { return fFactory.name(); } diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index a7187d548c..af9bb054a4 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -480,7 +480,8 @@ bool GrGpuGL::flushGraphicsState(DrawType type) { this->getDrawState().getTexture(s)); fProgramData->fCustomStage[s]->setData( this->glInterface(), - *sampler.getCustomStage(), s); + *sampler.getCustomStage(), + drawState.getRenderTarget(), s); } } } |