diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-26 17:53:18 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-26 17:53:18 +0000 |
| commit | 28a15fb8d603847949a61657ef5cb73ed9915021 (patch) | |
| tree | 0078f8fb070a3f0c11c03d2f7a9df5a2912273c9 /src/gpu/gl/GrGLEffect.cpp | |
| parent | c96982f806712dee912875b0bd59b75468ac3a99 (diff) | |
Make GrGLEffect::setData take GrEffectStage rather than GrEffect.
This allows the coord-change matrix to be communicated to setData(). An accessor for this matrix is also added to GrEffectStage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6779057
git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6143 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLEffect.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLEffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLEffect.cpp b/src/gpu/gl/GrGLEffect.cpp index b53a1cf9bb..0bbf1f7ccb 100644 --- a/src/gpu/gl/GrGLEffect.cpp +++ b/src/gpu/gl/GrGLEffect.cpp @@ -17,11 +17,11 @@ GrGLEffect::~GrGLEffect() { /////////////////////////////////////////////////////////////////////////////// -void GrGLEffect::setData(const GrGLUniformManager&, const GrEffect&) { +void GrGLEffect::setData(const GrGLUniformManager&, const GrEffectStage&) { } GrGLEffect::EffectKey GrGLEffect::GenTextureKey(const GrEffect& effect, - const GrGLCaps& caps) { + const GrGLCaps& caps) { EffectKey key = 0; for (int index = 0; index < effect.numTextures(); ++index) { const GrTextureAccess& access = effect.textureAccess(index); |