diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-04-03 17:17:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-04 13:32:01 +0000 |
| commit | be77a02a67145edd7ca12fb203b971bb5f1d75a5 (patch) | |
| tree | 168447831b458c7f5704f1e68f1959f57a0db0b4 /src/gpu/GrContext.cpp | |
| parent | ae52cccf8b72fbbbd3c009c60a48744988795ea6 (diff) | |
Hide GrPixelConfig in SkSurfaceCharacterization
TBR=bsalomon@google.com
Change-Id: Ifc38d0ca2b18128d27c187f789461fea62d1edae
Reviewed-on: https://skia-review.googlesource.com/117440
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrContext.cpp')
| -rw-r--r-- | src/gpu/GrContext.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index ce2dc8c1ae..f401f86a56 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -177,10 +177,6 @@ SkSurfaceCharacterization GrContextThreadSafeProxy::createCharacterization( return SkSurfaceCharacterization(); // return an invalid characterization } - if (!SkSurface_Gpu::Valid(ii)) { - return SkSurfaceCharacterization(); // return an invalid characterization - } - if (!fCaps->mipMapSupport()) { isMipMapped = false; } @@ -190,6 +186,10 @@ SkSurfaceCharacterization GrContextThreadSafeProxy::createCharacterization( return SkSurfaceCharacterization(); // return an invalid characterization } + if (!SkSurface_Gpu::Valid(fCaps.get(), config, ii.colorSpace())) { + return SkSurfaceCharacterization(); // return an invalid characterization + } + sampleCnt = fCaps->getRenderTargetSampleCount(sampleCnt, config); if (!sampleCnt) { return SkSurfaceCharacterization(); // return an invalid characterization @@ -207,11 +207,11 @@ SkSurfaceCharacterization GrContextThreadSafeProxy::createCharacterization( } return SkSurfaceCharacterization(sk_ref_sp<GrContextThreadSafeProxy>(this), - cacheMaxResourceBytes, - origin, ii.width(), ii.height(), config, FSAAType, sampleCnt, + cacheMaxResourceBytes, ii, + origin, config, FSAAType, sampleCnt, SkSurfaceCharacterization::Textureable(true), SkSurfaceCharacterization::MipMapped(isMipMapped), - ii.refColorSpace(), surfaceProps); + surfaceProps); } void GrContext::abandonContext() { |