aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@chromium.org>2014-09-05 10:45:30 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-09-05 10:45:30 -0700
commit5a80be22418176a2d15b0d3bd33215e28b516b24 (patch)
tree6d76190464f15286d3dc8c2bceda524be9390224 /src
parent4f90c50b561a8800a2e0a9019a47740e81a594bd (diff)
Small fix for RODrawState
BUG=skia: R=egdaniel@google.com, joshualitt@google.com Author: joshualitt@chromium.org Review URL: https://codereview.chromium.org/545273002
Diffstat (limited to 'src')
-rw-r--r--src/gpu/GrRODrawState.cpp6
1 files changed, 3 insertions, 3 deletions
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++) {