diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-02-21 13:02:32 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-21 18:22:47 +0000 |
| commit | 0a7aa14bf36cbb444b84902a37591d7a9c84fbd0 (patch) | |
| tree | aa2769ad071df6f5250a00be9a67ef0c6baf4d44 /tests | |
| parent | 32f72e25bd802d15ce43a3dd7ef4a3fcfd646727 (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 'tests')
| -rw-r--r-- | tests/DeferredDisplayListTest.cpp | 1 | ||||
| -rw-r--r-- | tests/ProxyTest.cpp | 1 | ||||
| -rw-r--r-- | tests/SurfaceTest.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 0fc4c5de14..924a93464a 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -165,6 +165,7 @@ public: GrGpu* gpu = context->contextPriv().getGpu(); GrPixelConfig config = SkImageInfo2GrPixelConfig(fColorType, nullptr, *context->caps()); + SkASSERT(kUnknown_GrPixelConfig != config); *backend = gpu->createTestingOnlyBackendTexture(nullptr, fWidth, fHeight, config, true, GrMipMapped::kNo); diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 20d721be86..f48e2a090f 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -199,6 +199,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { for (auto colorType : { kAlpha_8_SkColorType, kRGBA_8888_SkColorType }) { for (auto numSamples : {1, 4}) { GrPixelConfig config = SkImageInfo2GrPixelConfig(colorType, nullptr, caps); + SkASSERT(kUnknown_GrPixelConfig != config); int supportedNumSamples = caps.getRenderTargetSampleCount(numSamples, config); if (!supportedNumSamples) { diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index c20fb0768c..4ba549cd9a 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -1010,6 +1010,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceCreationWithColorSpace_Gpu, reporter, static const int kSize = 10; GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *context->caps()); + SkASSERT(kUnknown_GrPixelConfig != config); GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture( nullptr, kSize, kSize, config, true, GrMipMapped::kNo); |