commit 7d34d2eecc40d150d867e37d5160a1bc3cfccbde
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 24 17:41:47 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jan 24 17:41:47 2011 +0000
tree ba3561a9265b074533e820a0711901c37eabd553
parent 1a2e8d233d91cc4c6622ff3d975ab7d50604c923

Increase number of stages from 1 to 2
Move GrTextContext from stage 0 to stage 1 so it doesn't conflict with GrPaint (allow textured text)
Switch to dynamically generated shaders



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

gpu/src/GrDrawTarget.cpp

diff --git a/gpu/src/GrDrawTarget.cpp b/gpu/src/GrDrawTarget.cpp
index abc9fb4..0101ecd 100644
--- a/gpu/src/GrDrawTarget.cpp
+++ b/gpu/src/GrDrawTarget.cpp
@@ -472,9 +472,14 @@
 
 GrDrawTarget::AutoStateRestore::AutoStateRestore(GrDrawTarget* target) {
     fDrawTarget = target;
-    fDrawTarget->saveCurrentDrawState(&fDrawState);
+    if (NULL != fDrawTarget) {
+        fDrawTarget->saveCurrentDrawState(&fDrawState);
+    }
 }
 
 GrDrawTarget::AutoStateRestore::~AutoStateRestore() {
-    fDrawTarget->restoreDrawState(fDrawState);
+    if (NULL != fDrawTarget) {
+        fDrawTarget->restoreDrawState(fDrawState);
+    }
 }
+