From 5a80be22418176a2d15b0d3bd33215e28b516b24 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Fri, 5 Sep 2014 10:45:30 -0700 Subject: Small fix for RODrawState BUG=skia: R=egdaniel@google.com, joshualitt@google.com Author: joshualitt@chromium.org Review URL: https://codereview.chromium.org/545273002 --- src/gpu/GrRODrawState.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gpu/GrRODrawState.cpp b/src/gpu/GrRODrawState.cpp index f6a235517a..2f02482258 100644 --- a/src/gpu/GrRODrawState.cpp +++ b/src/gpu/GrRODrawState.cpp @@ -40,14 +40,14 @@ bool GrRODrawState::isEqual(const GrRODrawState& that) const { bool explicitLocalCoords = this->hasLocalCoordAttribute(); if (this->hasGeometryProcessor()) { if (!that.hasGeometryProcessor()) { - return kIncompatible_CombinedState; + return false; } else if (!GrEffectStage::AreCompatible(*this->getGeometryProcessor(), *that.getGeometryProcessor(), explicitLocalCoords)) { - return kIncompatible_CombinedState; + return false; } } else if (that.hasGeometryProcessor()) { - return kIncompatible_CombinedState; + return false; } for (int i = 0; i < this->numColorStages(); i++) { -- cgit v1.2.3