diff options
author | Brian Salomon <bsalomon@google.com> | 2018-02-02 20:32:49 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-03 01:59:59 +0000 |
commit | bdecacfbe47bc7211336bb847bb33c00ef85ea3e (patch) | |
tree | fdaac47f9254d9a8e3de61604b899eae8cb718ff /src/gpu/SkGr.cpp | |
parent | 816acee9be62d9de323ff5144017451e443b3329 (diff) |
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend.""""""
This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32.
Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version
Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab
Reviewed-on: https://skia-review.googlesource.com/103181
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/SkGr.cpp')
-rw-r--r-- | src/gpu/SkGr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 3d951c4673..29a89434d9 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -48,7 +48,7 @@ GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo& info, const GrCaps& ca desc.fWidth = info.width(); desc.fHeight = info.height(); desc.fConfig = SkImageInfo2GrPixelConfig(info, caps); - desc.fSampleCnt = 0; + desc.fSampleCnt = 1; return desc; } @@ -170,7 +170,7 @@ sk_sp<GrTextureProxy> GrCopyBaseMipMapToTextureProxy(GrContext* ctx, GrTexturePr desc.fWidth = baseProxy->width(); desc.fHeight = baseProxy->height(); desc.fConfig = baseProxy->config(); - desc.fSampleCnt = 0; + desc.fSampleCnt = 1; sk_sp<GrTextureProxy> proxy = proxyProvider->createMipMapProxy(desc, SkBudgeted::kYes); if (!proxy) { @@ -268,7 +268,7 @@ sk_sp<GrTextureProxy> GrMakeCachedImageProxy(GrProxyProvider* proxyProvider, } if (!proxy) { proxy = proxyProvider->createTextureProxy(std::move(srcImage), kNone_GrSurfaceFlags, - kTopLeft_GrSurfaceOrigin, 0, SkBudgeted::kYes, + kTopLeft_GrSurfaceOrigin, 1, SkBudgeted::kYes, SkBackingFit::kExact); if (proxy && originalKey.isValid()) { proxyProvider->assignUniqueKeyToProxy(originalKey, proxy.get()); |