| Index: src/gpu/gl/GrGLShaderBuilder.cpp
|
| diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
|
| index b72e23f9ba20b10879c70b6c48c52324ec288cf7..c5df4c803ce501011616bef7c7d458d1668d8996 100644
|
| --- a/src/gpu/gl/GrGLShaderBuilder.cpp
|
| +++ b/src/gpu/gl/GrGLShaderBuilder.cpp
|
| @@ -187,7 +187,7 @@ bool GrGLShaderBuilder::enableFeature(GLSLFeature feature) {
|
| }
|
| return true;
|
| default:
|
| - GrCrash("Unexpected GLSLFeature requested.");
|
| + SkFAIL("Unexpected GLSLFeature requested.");
|
| return false;
|
| }
|
| }
|
| @@ -218,7 +218,7 @@ bool GrGLShaderBuilder::enablePrivateFeature(GLSLPrivateFeature feature) {
|
| "GL_NV_shader_framebuffer_fetch");
|
| return true;
|
| default:
|
| - GrCrash("Unexpected GLSLPrivateFeature requested.");
|
| + SkFAIL("Unexpected GLSLPrivateFeature requested.");
|
| return false;
|
| }
|
| }
|
| @@ -249,7 +249,7 @@ const char* GrGLShaderBuilder::dstColor() {
|
| if (fCodeStage.inStageCode()) {
|
| const GrEffectRef& effect = *fCodeStage.effectStage()->getEffect();
|
| if (!effect->willReadDstColor()) {
|
| - GrDebugCrash("GrGLEffect asked for dst color but its generating GrEffect "
|
| + SkDEBUGFAIL("GrGLEffect asked for dst color but its generating GrEffect "
|
| "did not request access.");
|
| return "";
|
| }
|
| @@ -399,7 +399,7 @@ const char* GrGLShaderBuilder::fragmentPosition() {
|
| if (fCodeStage.inStageCode()) {
|
| const GrEffectRef& effect = *fCodeStage.effectStage()->getEffect();
|
| if (!effect->willReadFragmentPosition()) {
|
| - GrDebugCrash("GrGLEffect asked for frag position but its generating GrEffect "
|
| + SkDEBUGFAIL("GrGLEffect asked for frag position but its generating GrEffect "
|
| "did not request access.");
|
| return "";
|
| }
|
| @@ -483,9 +483,9 @@ inline void append_default_precision_qualifier(GrGLShaderVar::Precision p,
|
| str->append("precision lowp float;\n");
|
| break;
|
| case GrGLShaderVar::kDefault_Precision:
|
| - GrCrash("Default precision now allowed.");
|
| + SkFAIL("Default precision now allowed.");
|
| default:
|
| - GrCrash("Unknown precision value.");
|
| + SkFAIL("Unknown precision value.");
|
| }
|
| }
|
| }
|
|
|