commit f2f8fc37265a6ef06897117451a3a9238287c13b
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 18 18:25:07 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 18 18:25:07 2012 +0000
tree b264c65015c08411ad62b3f8d75f4d53d76dfdbb
parent 77eec248cbd5a0c2f5f8595e62e3bff5ea363f17

Fix grdrawstate == test when left side has disabled stage and right side does not

Review URL: http://codereview.appspot.com/6427044/



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

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 3de33d8..b5c3482 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -797,8 +797,11 @@
         }
 
         for (int i = 0; i < kNumStages; i++) {
-            if (this->isStageEnabled(i) &&
-                this->fSamplerStates[i] != s.fSamplerStates[i]) {
+            bool enabled = this->isStageEnabled(i);
+            if (enabled != s.isStageEnabled(i)) {
+                return false;
+            }
+            if (enabled && this->fSamplerStates[i] != s.fSamplerStates[i]) {
                 return false;
             }
         }