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>
diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp
index 706353a..aa9a509 100644
--- a/src/gpu/effects/GrBezierEffect.cpp
+++ b/src/gpu/effects/GrBezierEffect.cpp
@@ -196,7 +196,7 @@
break;
}
default:
- SkFAIL("Shouldn't get here");
+ SK_ABORT("Shouldn't get here");
}
// TODO should we really be doing this?
@@ -401,7 +401,7 @@
break;
}
default:
- SkFAIL("Shouldn't get here");
+ SK_ABORT("Shouldn't get here");
}
if (0xff != gp.coverageScale()) {
@@ -642,7 +642,7 @@
break;
}
default:
- SkFAIL("Shouldn't get here");
+ SK_ABORT("Shouldn't get here");
}
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index e784ed7..2cf7919 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -44,7 +44,7 @@
break;
default:
- SkFAIL("Unknown conversion op.");
+ SK_ABORT("Unknown conversion op.");
break;
}
fragBuilder->codeAppendf("%s = color;", args.fOutputColor);
diff --git a/src/gpu/effects/GrConstColorProcessor.cpp b/src/gpu/effects/GrConstColorProcessor.cpp
index 0859224..a8b328e 100644
--- a/src/gpu/effects/GrConstColorProcessor.cpp
+++ b/src/gpu/effects/GrConstColorProcessor.cpp
@@ -75,7 +75,7 @@
case kModulateRGBA_InputMode:
return fColor.modulate(input);
}
- SkFAIL("Unexpected mode");
+ SK_ABORT("Unexpected mode");
return GrColor4f::TransparentBlack();
}
diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/effects/GrCoverageSetOpXP.cpp
index 344762d..267f43d 100644
--- a/src/gpu/effects/GrCoverageSetOpXP.cpp
+++ b/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -203,7 +203,7 @@
}
}
#undef _CONSTEXPR_
- SkFAIL("Unknown region op.");
+ SK_ABORT("Unknown region op.");
return nullptr;
}
diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
index b54ca53..23b6178 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -102,7 +102,7 @@
break;
}
default: {
- SkFAIL("Unsupported operation.");
+ SK_ABORT("Unsupported operation.");
}
}
}
@@ -134,7 +134,7 @@
imageIncrement[1] = ySign / texture.height();
break;
default:
- SkFAIL("Unknown filter direction.");
+ SK_ABORT("Unknown filter direction.");
}
pdman.set2fv(fImageIncrementUni, 1, imageIncrement);
if (conv.useBounds()) {
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index c571b83..658f190 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -459,7 +459,7 @@
fragBuilder->codeAppendf("%s = (float4(1.0) - %s) * %s;", output, inColor, inCoverage);
break;
default:
- SkFAIL("Unsupported output type.");
+ SK_ABORT("Unsupported output type.");
break;
}
}
@@ -753,7 +753,7 @@
case SkBlendMode::kScreen:
return &gScreenPDXPF;
default:
- SkFAIL("Unexpected blend mode.");
+ SK_ABORT("Unexpected blend mode.");
return nullptr;
}
}
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
index f253dfe..6d47e58 100644
--- a/src/gpu/effects/GrRRectEffect.cpp
+++ b/src/gpu/effects/GrRRectEffect.cpp
@@ -367,7 +367,7 @@
rect.fBottom -= radius;
break;
default:
- SkFAIL("Should have been one of the above cases.");
+ SK_ABORT("Should have been one of the above cases.");
}
pdman.set4f(fInnerRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
radius += 0.5f;
@@ -583,7 +583,7 @@
break;
}
default:
- SkFAIL("RRect should always be simple or nine-patch.");
+ SK_ABORT("RRect should always be simple or nine-patch.");
}
// implicit is the evaluation of (x/a)^2 + (y/b)^2 - 1.
fragBuilder->codeAppend("float implicit = dot(Z, dxy) - 1.0;");
@@ -664,7 +664,7 @@
break;
}
default:
- SkFAIL("RRect should always be simple or nine-patch.");
+ SK_ABORT("RRect should always be simple or nine-patch.");
}
pdman.set4f(fInnerRectUniform, rect.fLeft, rect.fTop, rect.fRight, rect.fBottom);
fPrevRRect = rrect;
diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index f2c026f..3b9b44c 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -73,7 +73,7 @@
case SkBlendMode::kClear:
case SkBlendMode::kSrc:
case SkBlendMode::kDst:
- SkFAIL("Should never create clear, src, or dst compose two FP.");
+ SK_ABORT("Should never create clear, src, or dst compose two FP.");
flags = kNone_OptimizationFlags;
break;
@@ -303,7 +303,7 @@
OptimizationFlags flags;
switch (mode) {
case SkBlendMode::kClear:
- SkFAIL("Should never create clear compose one FP.");
+ SK_ABORT("Should never create clear compose one FP.");
flags = kNone_OptimizationFlags;
break;