diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-20 17:47:16 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-20 17:47:16 +0000 |
| commit | 67e7cde5c5e59a8f1de7ee28276b8193ecb2bc7f (patch) | |
| tree | fbb2c63213570deb6062b3eb8e9ba1a13c0431d4 /src/effects/gradients/SkGradientShaderPriv.h | |
| parent | 113994051b41366a7b25851d05cd56e89866a33b (diff) | |
revert 8265-8264 (broke build)
git-svn-id: http://skia.googlecode.com/svn/trunk@8268 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/gradients/SkGradientShaderPriv.h')
| -rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index b9dbf1b87b..271a2b6e51 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -274,7 +274,7 @@ public: GrGLGradientEffect(const GrBackendEffectFactory& factory); virtual ~GrGLGradientEffect(); - virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE; + virtual void setData(const GrGLUniformManager&, const GrEffectStage&) SK_OVERRIDE; protected: /** @@ -290,7 +290,7 @@ protected: * Subclasses must call this. It will return a value restricted to the lower kMatrixKeyBitCnt * bits. */ - static EffectKey GenMatrixKey(const GrDrawEffect&); + static EffectKey GenMatrixKey(const GrEffectStage& s); /** * Inserts code to implement the GrGradientEffect's matrix. This should be called before a @@ -302,6 +302,7 @@ protected: */ void setupMatrix(GrGLShaderBuilder* builder, EffectKey key, + const char* vertexCoords, const char** fsCoordName, const char** vsVaryingName = NULL, GrSLType* vsVaryingType = NULL); @@ -320,8 +321,6 @@ protected: const GrGLShaderBuilder::TextureSampler&); private: - static const GrEffect::CoordsType kCoordsType = GrEffect::kLocal_CoordsType; - SkScalar fCachedYCoord; GrGLUniformManager::UniformHandle fFSYUni; GrGLEffectMatrix fEffectMatrix; |