Add assert to catch circular drawing higher up the call stack.

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

diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h
index 8274140..8e39fb5 100644 (file)
--- a/include/gpu/GrTexture.h
+++ b/include/gpu/GrTexture.h
@@ -94,6 +94,7 @@ public:
      *            render target
      */
     GrRenderTarget* asRenderTarget() { return fRenderTarget; }
+    const GrRenderTarget* asRenderTarget() const { return fRenderTarget; }
 
     /**
      * Removes the reference on the associated GrRenderTarget held by this

diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 730450b..3e3ff51 100644 (file)
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -771,6 +771,14 @@ bool GrDrawTarget::checkDraw(GrPrimitiveType type, int startVertex,
             GrCrash("Index reads outside valid index range.");
         }
     }
+
+    GrAssert(NULL != this->getDrawState().getRenderTarget());
+    for (int i = 0; i < GrDrawState::kNumStages; ++i) {
+        if (this->getDrawState().getTexture(i)) {
+            GrAssert(this->getDrawState().getTexture(i)->asRenderTarget() != 
+                     this->getDrawState().getRenderTarget());
+        }
+    }
 #endif
     const GrDrawState& drawState = this->getDrawState();
     if (NULL == drawState.getRenderTarget()) {