aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-21 21:18:13 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-05-21 21:18:13 +0000
commit16fd21ba2238f30eda25d8928307fc68c26eb98d (patch)
treef9107a7a27973f66e731d3461bcbec244280a19a /src/gpu
parent289efe014ad7628de7cf2c5177a42cacd1e335ad (diff)
Rename GrProgramStageFactory::stageKey to GrProgramStageFactory::glStageKey since it is GL-specific
Review URL: http://codereview.appspot.com/6218060/ git-svn-id: http://skia.googlecode.com/svn/trunk@4020 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/gl/GrGpuGLShaders.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index 08cfaf71d6..7687a14b85 100644
--- a/src/gpu/gl/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -302,7 +302,7 @@ bool GrGpuGLShaders::programUnitTest() {
(GrSamplerState::FilterDirection)direction,
stage.fKernelWidth, kernel);
stage.fCustomStageKey =
- customStages[s]->getFactory().stageKey(customStages[s]);
+ customStages[s]->getFactory().glStageKey(customStages[s]);
}
}
CachedData cachedData;
@@ -934,7 +934,7 @@ void setup_custom_stage(GrGLProgram::ProgramDesc::StageDesc* stage,
GrCustomStage* customStage = sampler.getCustomStage();
if (customStage) {
const GrProgramStageFactory& factory = customStage->getFactory();
- stage->fCustomStageKey = factory.stageKey(customStage);
+ stage->fCustomStageKey = factory.glStageKey(customStage);
customStages[index] = customStage;
} else {
stage->fCustomStageKey = 0;