commit 08283afc265f1153834256fc1012519813ba6b73
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 26 13:01:20 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 26 13:01:20 2012 +0000
tree 553cfc58076746c1326f88b23dc814f42457be87
parent 27b40e9f36f567a57ae92860052b36cedacdd4fd

Rename GrSamplerState to GrEffectStage.

R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6777053

git-svn-id: http://skia.googlecode.com/svn/trunk@6135 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrDrawState.cpp

diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 0f0a27a..a78bcc0 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -13,7 +13,7 @@
     for (int i = 0; i < GrPaint::kMaxColorStages; ++i) {
         int s = i + GrPaint::kFirstColorStage;
         if (paint.isColorStageEnabled(i)) {
-            *this->sampler(s) = paint.getColorSampler(i);
+            *this->stage(s) = paint.getColorStage(i);
         }
     }
 
@@ -22,7 +22,7 @@
     for (int i = 0; i < GrPaint::kMaxCoverageStages; ++i) {
         int s = i + GrPaint::kFirstCoverageStage;
         if (paint.isCoverageStageEnabled(i)) {
-            *this->sampler(s) = paint.getCoverageSampler(i);
+            *this->stage(s) = paint.getCoverageStage(i);
         }
     }
 
@@ -48,7 +48,7 @@
         fDrawState->setViewMatrix(fViewMatrix);
         for (int s = 0; s < GrDrawState::kNumStages; ++s) {
             if (fRestoreMask & (1 << s)) {
-                fDrawState->sampler(s)->restoreCoordChange(fSavedCoordChanges[s]);
+                fDrawState->stage(s)->restoreCoordChange(fSavedCoordChanges[s]);
             }
         }
     }
@@ -71,8 +71,8 @@
     for (int s = 0; s < GrDrawState::kNumStages; ++s) {
         if (!(explicitCoordStageMask & (1 << s)) && drawState->isStageEnabled(s)) {
             fRestoreMask |= (1 << s);
-            fDrawState->sampler(s)->saveCoordChange(&fSavedCoordChanges[s]);
-            drawState->sampler(s)->preConcatCoordChange(preconcatMatrix);
+            fDrawState->stage(s)->saveCoordChange(&fSavedCoordChanges[s]);
+            drawState->stage(s)->preConcatCoordChange(preconcatMatrix);
         }
     }
 }
@@ -84,7 +84,7 @@
         fDrawState->setViewMatrix(fViewMatrix);
         for (int s = 0; s < GrDrawState::kNumStages; ++s) {
             if (fRestoreMask & (1 << s)) {
-                fDrawState->sampler(s)->restoreCoordChange(fSavedCoordChanges[s]);
+                fDrawState->stage(s)->restoreCoordChange(fSavedCoordChanges[s]);
             }
         }
     }
@@ -117,9 +117,9 @@
                 inverted = true;
             }
             fRestoreMask |= (1 << s);
-            GrSamplerState* sampler = drawState->sampler(s);
-            sampler->saveCoordChange(&fSavedCoordChanges[s]);
-            sampler->preConcatCoordChange(invVM);
+            GrEffectStage* stage = drawState->stage(s);
+            stage->saveCoordChange(&fSavedCoordChanges[s]);
+            stage->preConcatCoordChange(invVM);
         }
     }
     drawState->viewMatrix()->reset();