diff options
| author |  Kevin Lubick <kjlubick@google.com> | 2018-01-05 10:11:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-05 18:03:25 +0000 |
| commit | 4284613cfe211bfdcf3506f363d382c044ae8b51 (patch) | |
| tree | 1004283289d9e70c786dd01702c8a8b144aa5932 /src/gpu/GrTextureMaker.cpp | |
| parent | 4c79ecf2f493c0eaa4f58cf0bb086d61ea2aebcb (diff) | |
Enable conditional-uninitialized flag
Bug: skia:7462
Cq-Include-Trybots: skia.primary:Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD
Change-Id: I1c0a09984bf28a5c620a89af56040f018bae6310
Reviewed-on: https://skia-review.googlesource.com/90941
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'src/gpu/GrTextureMaker.cpp')
| -rw-r--r-- | src/gpu/GrTextureMaker.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp index b3a16f5d8c..6cb9832b59 100644 --- a/src/gpu/GrTextureMaker.cpp +++ b/src/gpu/GrTextureMaker.cpp @@ -42,16 +42,12 @@ sk_sp<GrTextureProxy> GrTextureMaker::refTextureProxyForParams(const GrSamplerSt } } - GrSurfaceOrigin origOrigin; + GrSurfaceOrigin origOrigin = original ? original->origin() + : kTopLeft_GrSurfaceOrigin; GrUniqueKey copyKey; this->makeCopyKey(copyParams, ©Key, dstColorSpace); sk_sp<GrTextureProxy> cachedProxy; if (copyKey.isValid()) { - if (original) { - origOrigin = original->origin(); - } else { - origOrigin = kTopLeft_GrSurfaceOrigin; - } cachedProxy = fContext->resourceProvider()->findOrCreateProxyByUniqueKey(copyKey, origOrigin); if (cachedProxy && (!willBeMipped || GrMipMapped::kYes == cachedProxy->mipMapped())) { |