commit 6f261bed0252e3f3caa595798364e0bf12a2573a
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 24 19:07:10 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Oct 24 19:07:10 2012 +0000
tree e6cf7cfab6ff785b002b88b165a6bd00a9402960
parent a469c28c3c16214733a25201a286970f57b3d944

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

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 6951d46..f8db4a5 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -69,8 +69,7 @@
 
     /**
      * Resets to the default state.
-     * Sampler states *will* be modified: textures or CustomStage objects
-     * will be released.
+     * Sampler states *will* be modified: textures or GrEffect objects will be released.
      */
     void reset() {
 
@@ -190,27 +189,27 @@
      * Creates a GrSingleTextureEffect.
      */
     void createTextureEffect(int stage, GrTexture* texture) {
-        GrAssert(!this->getSampler(stage).getCustomStage());
-        this->sampler(stage)->setCustomStage(
+        GrAssert(!this->getSampler(stage).getEffect());
+        this->sampler(stage)->setEffect(
             SkNEW_ARGS(GrSingleTextureEffect, (texture)))->unref();
     }
     void createTextureEffect(int stage, GrTexture* texture, const GrMatrix& matrix) {
-        GrAssert(!this->getSampler(stage).getCustomStage());
+        GrAssert(!this->getSampler(stage).getEffect());
         GrEffect* customStage = SkNEW_ARGS(GrSingleTextureEffect, (texture));
-        this->sampler(stage)->setCustomStage(customStage, matrix)->unref();
+        this->sampler(stage)->setEffect(customStage, matrix)->unref();
     }
     void createTextureEffect(int stage, GrTexture* texture,
                              const GrMatrix& matrix,
                              const GrTextureParams& params) {
-        GrAssert(!this->getSampler(stage).getCustomStage());
+        GrAssert(!this->getSampler(stage).getEffect());
         GrEffect* customStage = SkNEW_ARGS(GrSingleTextureEffect, (texture, params));
-        this->sampler(stage)->setCustomStage(customStage, matrix)->unref();
+        this->sampler(stage)->setEffect(customStage, matrix)->unref();
     }
 
 
     bool stagesDisabled() {
         for (int i = 0; i < kNumStages; ++i) {
-            if (NULL != fSamplerStates[i].getCustomStage()) {
+            if (NULL != fSamplerStates[i].getEffect()) {
                 return false;
             }
         }
@@ -218,7 +217,7 @@
     }
 
     void disableStage(int index) {
-        fSamplerStates[index].setCustomStage(NULL);
+        fSamplerStates[index].setEffect(NULL);
     }
 
     /**
@@ -825,7 +824,7 @@
 
     bool isStageEnabled(int s) const {
         GrAssert((unsigned)s < kNumStages);
-        return (NULL != fSamplerStates[s].getCustomStage());
+        return (NULL != fSamplerStates[s].getEffect());
     }
 
     // Most stages are usually not used, so conditionals here