diff options
author | Ben Wagner <bungeman@google.com> | 2017-08-16 10:53:04 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-16 15:37:54 +0000 |
commit | b4aab9ae6d27c446af8302b79d15b832c816c633 (patch) | |
tree | 27e7f87a7a5e3d61990bc2742d9b9f167d26e0c3 /tools/gpu/gl/debug | |
parent | edf3dc094b0fc55bfc932539da1127484051b474 (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 'tools/gpu/gl/debug')
-rw-r--r-- | tools/gpu/gl/debug/DebugGLTestContext.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/gpu/gl/debug/DebugGLTestContext.cpp b/tools/gpu/gl/debug/DebugGLTestContext.cpp index e8eea8f78e..3cecd07a0a 100644 --- a/tools/gpu/gl/debug/DebugGLTestContext.cpp +++ b/tools/gpu/gl/debug/DebugGLTestContext.cpp @@ -662,7 +662,7 @@ public: break; } default: - SkFAIL("Unexpected pname to GetIntegerv"); + SK_ABORT("Unexpected pname to GetIntegerv"); } } @@ -688,7 +688,7 @@ public: *params = 32; break; default: - SkFAIL("Unexpected pname passed GetQueryiv."); + SK_ABORT("Unexpected pname passed GetQueryiv."); } } @@ -730,7 +730,7 @@ public: case GR_GL_RENDERER: return (const GrGLubyte*)"The Debug (Non-)Renderer"; default: - SkFAIL("Unexpected name passed to GetString"); + SK_ABORT("Unexpected name passed to GetString"); return nullptr; } } @@ -747,7 +747,7 @@ public: } } default: - SkFAIL("Unexpected name passed to GetStringi"); + SK_ABORT("Unexpected name passed to GetStringi"); return nullptr; } } @@ -756,7 +756,7 @@ public: GrGLint* params) override { // we used to use this to query stuff about externally created textures, // now we just require clients to tell us everything about the texture. - SkFAIL("Should never query texture parameters."); + SK_ABORT("Should never query texture parameters."); } GrGLvoid deleteVertexArrays(GrGLsizei n, const GrGLuint* ids) override { @@ -893,7 +893,7 @@ public: *params = buffer->getUsage(); break; default: - SkFAIL("Unexpected value to glGetBufferParamateriv"); + SK_ABORT("Unexpected value to glGetBufferParamateriv"); break; } } @@ -901,7 +901,7 @@ public: private: inline int static GetBufferIndex(GrGLenum glTarget) { switch (glTarget) { - default: SkFAIL("Unexpected GL target to GetBufferIndex"); + default: SK_ABORT("Unexpected GL target to GetBufferIndex"); case GR_GL_ARRAY_BUFFER: return 0; case GR_GL_ELEMENT_ARRAY_BUFFER: return 1; case GR_GL_TEXTURE_BUFFER: return 2; @@ -987,7 +987,7 @@ private: break; // we don't expect any other pnames default: - SkFAIL("Unexpected pname to GetProgramiv"); + SK_ABORT("Unexpected pname to GetProgramiv"); break; } } @@ -1002,7 +1002,7 @@ private: *params = 0; break; default: - SkFAIL("Unexpected pname passed to GetQueryObject."); + SK_ABORT("Unexpected pname passed to GetQueryObject."); break; } } |