aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/SkDisplacementMapEffect.cpp
diff options
context:
space:
mode:
authorGravatar mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-22 15:37:26 +0000
committerGravatar mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-22 15:37:26 +0000
commit330313a8a8343876ee596da39da06a5d69badd9c (patch)
tree06572dd2cecc561c641b39af8fbcc2d93728b333 /src/effects/SkDisplacementMapEffect.cpp
parentf68aed33819cbc98a95edeadde1da9303eca7fb2 (diff)
My clang now doesn't complain about !"foo".
BUG= R=robertphillips@google.com Review URL: https://codereview.chromium.org/22875037 git-svn-id: http://skia.googlecode.com/svn/trunk@10874 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkDisplacementMapEffect.cpp')
-rw-r--r--src/effects/SkDisplacementMapEffect.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index dad0623d2f..6a3abb5a3c 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -21,7 +21,7 @@ namespace {
template<SkDisplacementMapEffect::ChannelSelectorType type>
uint32_t getValue(SkColor, const SkUnPreMultiply::Scale*) {
- SkASSERT(!"Unknown channel selector");
+ SkDEBUGFAIL("Unknown channel selector");
return 0;
}
@@ -97,7 +97,7 @@ void computeDisplacement(SkDisplacementMapEffect::ChannelSelectorType yChannelSe
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown Y channel selector");
+ SkDEBUGFAIL("Unknown Y channel selector");
}
}
@@ -124,7 +124,7 @@ void computeDisplacement(SkDisplacementMapEffect::ChannelSelectorType xChannelSe
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown X channel selector");
+ SkDEBUGFAIL("Unknown X channel selector");
}
}
@@ -456,7 +456,7 @@ void GrGLDisplacementMapEffect::emitCode(GrGLShaderBuilder* builder,
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown X channel selector");
+ SkDEBUGFAIL("Unknown X channel selector");
}
switch (fYChannelSelector) {
@@ -474,7 +474,7 @@ void GrGLDisplacementMapEffect::emitCode(GrGLShaderBuilder* builder,
break;
case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
default:
- SkASSERT(!"Unknown Y channel selector");
+ SkDEBUGFAIL("Unknown Y channel selector");
}
builder->fsCodeAppend("-vec2(0.5));\t\t");