aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/gpu
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-02-21 13:02:32 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-21 18:22:47 +0000
commit0a7aa14bf36cbb444b84902a37591d7a9c84fbd0 (patch)
treeaa2769ad071df6f5250a00be9a67ef0c6baf4d44 /tools/gpu
parent32f72e25bd802d15ce43a3dd7ef4a3fcfd646727 (diff)
Add checks for failed SkImageInfo2GrPixelConfig calls
Bug: skia:7645 Change-Id: I32b9326fb43490ef6a7a99527243b68d89184ae1 Reviewed-on: https://skia-review.googlesource.com/109083 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/gpu')
-rw-r--r--tools/gpu/GrTest.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index df5baf9b37..c6d3bbe2ef 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -187,6 +187,9 @@ GrBackendTexture GrGpu::createTestingOnlyBackendTexture(void* pixels, int w, int
SkColorType colorType, bool isRenderTarget,
GrMipMapped mipMapped) {
GrPixelConfig config = SkImageInfo2GrPixelConfig(colorType, nullptr, *this->caps());
+ if (kUnknown_GrPixelConfig == config) {
+ return GrBackendTexture();
+ }
return this->createTestingOnlyBackendTexture(pixels, w, h, config, isRenderTarget, mipMapped);
}