aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrShaderVar.cpp
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-08-16 10:53:04 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-08-16 15:37:54 +0000
commitb4aab9ae6d27c446af8302b79d15b832c816c633 (patch)
tree27e7f87a7a5e3d61990bc2742d9b9f167d26e0c3 /src/gpu/GrShaderVar.cpp
parentedf3dc094b0fc55bfc932539da1127484051b474 (diff)
Replace SkFAIL with SK_ABORT.
SkFAIL is a legacy macro which is just SK_ABORT. This CL mechanically changes uses of SkFAIL to SK_ABORT in preparation for its removal. The related sk_throw macro will be changed independently, due to needing to actually clean up its users. Change-Id: Id70b5c111a02d2458dc60c8933f444df27d9cebb Reviewed-on: https://skia-review.googlesource.com/35284 Reviewed-by: Derek Sollenberger <djsollen@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/gpu/GrShaderVar.cpp')
-rw-r--r--src/gpu/GrShaderVar.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrShaderVar.cpp b/src/gpu/GrShaderVar.cpp
index e938c36d01..e6d774c329 100644
--- a/src/gpu/GrShaderVar.cpp
+++ b/src/gpu/GrShaderVar.cpp
@@ -17,7 +17,7 @@ static const char* type_modifier_string(GrShaderVar::TypeModifier t) {
case GrShaderVar::kOut_TypeModifier: return "out";
case GrShaderVar::kUniform_TypeModifier: return "uniform";
}
- SkFAIL("Unknown shader variable type modifier.");
+ SK_ABORT("Unknown shader variable type modifier.");
return "";
}
@@ -52,7 +52,7 @@ void GrShaderVar::setMemoryModel(GrSLMemoryModel model) {
this->addModifier("volatile");
return;
}
- SkFAIL("Unknown memory model.");
+ SK_ABORT("Unknown memory model.");
}
void GrShaderVar::setRestrict(GrSLRestrict restrict) {
@@ -63,7 +63,7 @@ void GrShaderVar::setRestrict(GrSLRestrict restrict) {
this->addModifier("restrict");
return;
}
- SkFAIL("Unknown restrict.");
+ SK_ABORT("Unknown restrict.");
}
void GrShaderVar::setIOType(GrIOType ioType) {
@@ -77,7 +77,7 @@ void GrShaderVar::setIOType(GrIOType ioType) {
this->addModifier("writeonly");
return;
}
- SkFAIL("Unknown io type.");
+ SK_ABORT("Unknown io type.");
}
void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) const {