diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-22 20:36:53 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-22 20:36:53 +0000 |
| commit | d3353646c31ccb90cc43727ef0fa7869b4e4fe07 (patch) | |
| tree | 9c9494b27b1c68d2d9fdcb749519d773405df0c9 /src/effects/SkMorphologyImageFilter.cpp | |
| parent | 077348cfd0b4c424393ce83cb9ceded8afe60216 (diff) | |
Revert r6330 thru 6333 while we figure out what to do about Intel bots (possible driver bug).
git-svn-id: http://skia.googlecode.com/svn/trunk@6037 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkMorphologyImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMorphologyImageFilter.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 3c2c28450d..9bddb9b9e6 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -281,7 +281,10 @@ public: static inline StageKey GenKey(const GrCustomStage& s, const GrGLCaps& caps); - virtual void setData(const GrGLUniformManager&, const GrCustomStage&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, + const GrCustomStage&, + const GrRenderTarget*, + int stageNum) SK_OVERRIDE; private: int width() const { return GrMorphologyEffect::WidthFromRadius(fRadius); } @@ -349,7 +352,10 @@ GrGLProgramStage::StageKey GrGLMorphologyEffect::GenKey(const GrCustomStage& s, return key; } -void GrGLMorphologyEffect::setData(const GrGLUniformManager& uman, const GrCustomStage& data) { +void GrGLMorphologyEffect::setData(const GrGLUniformManager& uman, + const GrCustomStage& data, + const GrRenderTarget*, + int stageNum) { const Gr1DKernelEffect& kern = static_cast<const Gr1DKernelEffect&>(data); GrGLTexture& texture = |