GrCustomStage Renaming Part 3
Rename all things *CUSTOM_STAGE*, customStage*, and other miscellany
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6769048
git-svn-id: http://skia.googlecode.com/svn/trunk@6081 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 6fc3975..355cade 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -118,7 +118,7 @@
pdesc.fDualSrcOutput = ProgramDesc::kNone_DualSrcOutput;
}
- SkAutoTUnref<const GrEffect> customStages[GrDrawState::kNumStages];
+ SkAutoTUnref<const GrEffect> effects[GrDrawState::kNumStages];
for (int s = 0; s < GrDrawState::kNumStages; ++s) {
StageDesc& stage = pdesc.fStages[s];
@@ -142,19 +142,19 @@
if (stage.isEnabled()) {
GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()};
- customStages[s].reset(create_random_effect(&stage,
- &random,
- getContext(),
- dummyTextures));
- if (NULL != customStages[s]) {
+ effects[s].reset(create_random_effect(&stage,
+ &random,
+ getContext(),
+ dummyTextures));
+ if (NULL != effects[s]) {
stage.fCustomStageKey =
- customStages[s]->getFactory().glStageKey(*customStages[s], this->glCaps());
+ effects[s]->getFactory().glStageKey(*effects[s], this->glCaps());
}
}
}
- GR_STATIC_ASSERT(sizeof(customStages) ==
+ GR_STATIC_ASSERT(sizeof(effects) ==
GrDrawState::kNumStages * sizeof(GrEffect*));
- const GrEffect** stages = reinterpret_cast<const GrEffect**>(&customStages);
+ const GrEffect** stages = reinterpret_cast<const GrEffect**>(&effects);
SkAutoTUnref<GrGLProgram> program(GrGLProgram::Create(this->glContextInfo(),
pdesc,
stages));