diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-25 21:42:05 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-25 21:42:05 +0000 |
| commit | 46fba0d79335f17429bb71d87a04d93fb2ee992b (patch) | |
| tree | ba0a11312408578eeea662a47f249a6248081e74 /src/gpu/gl/GrGpuGL_program.cpp | |
| parent | 0e363109199198e21237fa4e8314094917e62640 (diff) | |
Rename StageKey and related stuff.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785049
git-svn-id: http://skia.googlecode.com/svn/trunk@6130 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL_program.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL_program.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index dfb1123a3a..d0b7b57b6d 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -573,10 +573,10 @@ void setup_effect(GrGLProgram::Desc::StageDesc* stage, const GrEffect* effect = sampler.getEffect(); if (effect) { const GrBackendEffectFactory& factory = effect->getFactory(); - stage->fCustomStageKey = factory.glStageKey(*effect, caps); + stage->fEffectKey = factory.glEffectKey(*effect, caps); effects[index] = effect; } else { - stage->fCustomStageKey = 0; + stage->fEffectKey = 0; effects[index] = NULL; } } @@ -695,8 +695,8 @@ void GrGpuGL::buildProgram(bool isPoints, setup_effect(&stage, sampler, this->glCaps(), effects, fCurrentProgram.get(), s); } else { - stage.fOptFlags = 0; - stage.fCustomStageKey = 0; + stage.fOptFlags = 0; + stage.fEffectKey = 0; effects[s] = NULL; } } |