commit 676e66096c60615bac52f365111596de5c4ca8a6
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 17:21:48 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 10 17:21:48 2012 +0000
tree 130012f821114e0561d17c327156d714ad83474e
parent 313f019287e324a14b58f081b16cf4afb18f0bd7

More carefully disable stages in Ganesh to avoid textures or effects
leaking between draw calls.

http://codereview.appspot.com/6353083/



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

src/gpu/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index c37affa..dcd32dd 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -446,7 +446,7 @@
 
     fGpu->drawSimpleRect(rect, NULL, 1 << 0);
 
-    drawState->setTexture(0, NULL);
+    drawState->disableStage(0);
 }
 
 // get a texture to act as a temporary buffer for AA clip boolean operations

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index f79249c..f756f8a 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1614,7 +1614,7 @@
     
     // disable all stages not accessible via the paint
     for (int s = GrPaint::kTotalStages; s < GrDrawState::kNumStages; ++s) {
-        fDrawState->setTexture(s, NULL);
+        fDrawState->disableStage(s);
     }
 
     fDrawState->setColor(paint.fColor);

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 9132770..c07001c 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -225,14 +225,19 @@
         }
         return true;
     }
+
+    void disableStage(int index) {
+        GrSafeSetNull(fTextures[index]);
+        fSamplerStates[index].setCustomStage(NULL);
+    }
+
     /**
      * Release all the textures and custom stages referred to by this
      * draw state.
      */
     void disableStages() {
         for (int i = 0; i < kNumStages; ++i) {
-            GrSafeSetNull(fTextures[i]);
-            fSamplerStates[i].setCustomStage(NULL);
+            this->disableStage(i);
         }
     }
 

src/gpu/GrSWMaskHelper.cpp

diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index fe32110..317fd41 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -226,6 +226,6 @@
                             SK_Scalar1 * rect.fRight,
                             SK_Scalar1 * rect.fBottom);
     target->drawRect(dstRect, NULL, stageMask, srcRects, NULL);
-    drawState->setTexture(kPathMaskStage, NULL);
+    drawState->disableStage(kPathMaskStage);
 }
 

src/gpu/GrTextContext.cpp

diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 93ef23d..daf48bf 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -68,7 +68,7 @@
         fMaxVertices = 0;
         fCurrVertex = 0;
         GrSafeSetNull(fCurrTexture);
-        drawState->setTexture(kGlyphMaskStage, NULL);
+        drawState->disableStage(kGlyphMaskStage);
     }
 }