summaryrefslogtreecommitdiff
path: root/gpu/gl/GrGpuGL_program.cpp
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-05-14 12:13:15 +0100
committerTorne (Richard Coles) <torne@google.com>2014-05-14 12:13:15 +0100
commit6b0bad3aba066dc8d7d47a5f6738ebf773ffc2e9 (patch)
treead988be7ad87928b7b98c44f2def4cce7d3330b6 /gpu/gl/GrGpuGL_program.cpp
parent27ab20dffff01006f5d20fdb2b3f4ea503d69114 (diff)
parentd60f7edf0fa7eb2eb7c99de486abfe61ad3dcd69 (diff)
downloadsrc-master.tar.gz
Merge from Chromium at DEPS revision 269336HEADmastermain
This commit was generated by merge_to_master.py. Change-Id: I9d3335dcb08fc53d18bec993b89047b409bd7eb1
Diffstat (limited to 'gpu/gl/GrGpuGL_program.cpp')
-rw-r--r--gpu/gl/GrGpuGL_program.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/gl/GrGpuGL_program.cpp b/gpu/gl/GrGpuGL_program.cpp
index 0a7bb0e3..b9b09847 100644
--- a/gpu/gl/GrGpuGL_program.cpp
+++ b/gpu/gl/GrGpuGL_program.cpp
@@ -309,7 +309,7 @@ void GrGpuGL::setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes) {
break;
default:
vbuf = NULL; // suppress warning
- GrCrash("Unknown geometry src type!");
+ SkFAIL("Unknown geometry src type!");
}
SkASSERT(NULL != vbuf);
@@ -333,7 +333,7 @@ void GrGpuGL::setupGeometry(const DrawInfo& info, size_t* indexOffsetInBytes) {
break;
default:
ibuf = NULL; // suppress warning
- GrCrash("Unknown geometry src type!");
+ SkFAIL("Unknown geometry src type!");
}
SkASSERT(NULL != ibuf);