From f2f8fc37265a6ef06897117451a3a9238287c13b Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 18 Jul 2012 18:25:07 +0000 Subject: [PATCH] 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 @@ public: } 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; } } -- 2.7.4