GrCustomStage Renaming Part 2
GrSamplerState member rename
GrCustomStageUnitTest rename
some comment updates
Review URL: https://codereview.appspot.com/6771043
git-svn-id: http://skia.googlecode.com/svn/trunk@6078 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
index 6608c66..b0656b2 100644
--- a/src/gpu/gl/GrGpuGL_program.cpp
+++ b/src/gpu/gl/GrGpuGL_program.cpp
@@ -199,7 +199,7 @@
const GrDrawState& drawState = this->getDrawState();
// FIXME: Still assuming only a single texture per custom stage
- const GrEffect* stage = drawState.getSampler(s).getCustomStage();
+ const GrEffect* stage = drawState.getSampler(s).getEffect();
if (0 == stage->numTextures()) {
return;
}
@@ -570,7 +570,7 @@
const GrGLCaps& caps,
const GrEffect** customStages,
GrGLProgram* program, int index) {
- const GrEffect* customStage = sampler.getCustomStage();
+ const GrEffect* customStage = sampler.getEffect();
if (customStage) {
const GrProgramStageFactory& factory = customStage->getFactory();
stage->fCustomStageKey = factory.glStageKey(*customStage, caps);
@@ -675,7 +675,7 @@
lastEnabledStage = s;
const GrSamplerState& sampler = drawState.getSampler(s);
// FIXME: Still assuming one texture per custom stage
- const GrEffect* customStage = drawState.getSampler(s).getCustomStage();
+ const GrEffect* customStage = drawState.getSampler(s).getEffect();
if (customStage->numTextures() > 0) {
const GrGLTexture* texture =