hack

src/gpu/GrDrawState.h

Index: src/gpu/GrDrawState.h
===================================================================
--- src/gpu/GrDrawState.h	(revision 14079)
+++ src/gpu/GrDrawState.h	(working copy)
@@ -632,7 +632,8 @@
      * @param target  The render target to set.
      */
     void setRenderTarget(GrRenderTarget* target) {
-        fRenderTarget.reset(SkSafeRef(target));
+        //SkDebugf("GrDrawState::setRenderTarget\n");
+        fRenderTarget1.reset(SkSafeRef(target));
     }
 
     /**
@@ -640,8 +641,8 @@
      *
      * @return    The currently set render target.
      */
-    const GrRenderTarget* getRenderTarget() const { return fRenderTarget.get(); }
-    GrRenderTarget* getRenderTarget() { return fRenderTarget.get(); }
+    const GrRenderTarget* getRenderTarget() const { return fRenderTarget1.get(); }
+    GrRenderTarget* getRenderTarget() { return fRenderTarget1.get(); }
 
     class AutoRenderTargetRestore : public ::SkNoncopyable {
     public:
@@ -846,7 +847,7 @@
     ///////////////////////////////////////////////////////////////////////////
 
     bool operator ==(const GrDrawState& s) const {
-        if (fRenderTarget.get() != s.fRenderTarget.get() ||
+        if (fRenderTarget1.get() != s.fRenderTarget1.get() ||
             fColorStages.count() != s.fColorStages.count() ||
             fCoverageStages.count() != s.fCoverageStages.count() ||
             fCommon != s.fCommon) {
@@ -868,7 +869,7 @@
 
     GrDrawState& operator= (const GrDrawState& s) {
         SkASSERT(0 == fBlockEffectRemovalCnt || 0 == this->numTotalStages());
-        this->setRenderTarget(s.fRenderTarget.get());
+        this->setRenderTarget(s.fRenderTarget1.get());
         fCommon = s.fCommon;
         fColorStages = s.fColorStages;
         fCoverageStages = s.fCoverageStages;
@@ -882,7 +883,7 @@
         fColorStages.reset();
         fCoverageStages.reset();
 
-        fRenderTarget.reset(NULL);
+        fRenderTarget1.reset(NULL);
 
         this->setDefaultVertexAttribs();
 
@@ -957,17 +958,18 @@
      */
     class DeferredState {
     public:
-        DeferredState() : fRenderTarget(NULL) {
+        DeferredState() : fRenderTarget1(NULL) {
             SkDEBUGCODE(fInitialized = false;)
         }
         // TODO: Remove this when DeferredState no longer holds a ref to the RT
-        ~DeferredState() { SkSafeUnref(fRenderTarget); }
+        ~DeferredState() { SkSafeUnref(fRenderTarget1); }
 
         void saveFrom(const GrDrawState& drawState) {
             fCommon = drawState.fCommon;
             // TODO: Here we will copy the GrRenderTarget pointer without taking a ref.
-            fRenderTarget = drawState.fRenderTarget.get();
-            SkSafeRef(fRenderTarget);
+//            SkDebugf("DeferredState::render target change\n");
+            fRenderTarget1 = drawState.fRenderTarget1.get();
+            SkSafeRef(fRenderTarget1);
             // Here we ref the effects directly rather than the effect-refs. TODO: When the effect-
             // ref gets fully unref'ed it will cause the underlying effect to unref its resources
             // and recycle them to the cache (if no one else is holding a ref to the resources).
@@ -985,7 +987,7 @@
         void restoreTo(GrDrawState* drawState) {
             SkASSERT(fInitialized);
             drawState->fCommon = fCommon;
-            drawState->setRenderTarget(fRenderTarget);
+            drawState->setRenderTarget(fRenderTarget1);
             // reinflate color/cov stage arrays.
             drawState->fColorStages.reset();
             for (int i = 0; i < fColorStageCnt; ++i) {
@@ -1001,7 +1003,7 @@
 
         bool isEqual(const GrDrawState& state) const {
             int numCoverageStages = fStages.count() - fColorStageCnt;
-            if (fRenderTarget != state.fRenderTarget.get() ||
+            if (fRenderTarget1 != state.fRenderTarget1.get() ||
                 fColorStageCnt != state.fColorStages.count() ||
                 numCoverageStages != state.fCoverageStages.count() ||
                 fCommon != state.fCommon) {
@@ -1025,7 +1027,7 @@
     private:
         typedef SkAutoSTArray<8, GrEffectStage::DeferredStage> DeferredStageArray;
 
-        GrRenderTarget*                       fRenderTarget;
+        GrRenderTarget*                       fRenderTarget1;
         CommonState                           fCommon;
         int                                   fColorStageCnt;
         DeferredStageArray                    fStages;
@@ -1035,7 +1037,7 @@
 
 private:
 
-    SkAutoTUnref<GrRenderTarget>        fRenderTarget;
+    SkAutoTUnref<GrRenderTarget>        fRenderTarget1;
     CommonState                         fCommon;
 
     typedef SkSTArray<4, GrEffectStage> EffectStageArray;