commit 96b383a78c842be9441a336508031fe23ae787b3
author Brian Salomon <bsalomon@google.com> Tue Aug 13 16:55:41 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Aug 13 23:53:25 2019 +0000
tree e6c5fde074999f5656701e8df8c67c9729ce53b1
parent f75996469d02b1bfba8b246c526a6d06233ced44

Remove GrRenderable param from GrProxyProvider::createTextureProxy()

Every caller passes kNo.

Change-Id: I9c21c77f57f6215246794b39fc8ec485d4ae23d0
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/234331
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index bfa6a63..95a5042 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -246,7 +246,6 @@
 }
 
 sk_sp<GrTextureProxy> GrProxyProvider::createTextureProxy(sk_sp<SkImage> srcImage,
-                                                          GrRenderable renderable,
                                                           int sampleCnt,
                                                           SkBudgeted budgeted,
                                                           SkBackingFit fit,
@@ -261,7 +260,7 @@
     const SkImageInfo& info = srcImage->imageInfo();
     GrColorType ct = SkColorTypeToGrColorType(info.colorType());
 
-    GrBackendFormat format = this->caps()->getDefaultBackendFormat(ct, renderable);
+    GrBackendFormat format = this->caps()->getDefaultBackendFormat(ct, GrRenderable::kNo);
 
     if (!format.isValid()) {
         SkBitmap copy8888;
@@ -272,19 +271,12 @@
         copy8888.setImmutable();
         srcImage = SkMakeImageFromRasterBitmap(copy8888, kNever_SkCopyPixelsMode);
         ct = GrColorType::kRGBA_8888;
-        format = this->caps()->getDefaultBackendFormat(ct, renderable);
+        format = this->caps()->getDefaultBackendFormat(ct, GrRenderable::kNo);
         if (!format.isValid()) {
             return nullptr;
         }
     }
 
-    if (renderable == GrRenderable::kYes) {
-        sampleCnt = this->caps()->getRenderTargetSampleCount(sampleCnt, format);
-        if (!sampleCnt) {
-            return nullptr;
-        }
-    }
-
     GrPixelConfig config = GrColorTypeToPixelConfig(ct);
     if (kUnknown_GrPixelConfig == config) {
         return nullptr;
@@ -296,17 +288,17 @@
     desc.fConfig = config;
 
     sk_sp<GrTextureProxy> proxy = this->createLazyProxy(
-            [desc, format, renderable, sampleCnt, budgeted, srcImage, fit,
+            [desc, format, sampleCnt, budgeted, srcImage, fit,
              ct](GrResourceProvider* resourceProvider) {
                 SkPixmap pixMap;
                 SkAssertResult(srcImage->peekPixels(&pixMap));
                 GrMipLevel mipLevel = { pixMap.addr(), pixMap.rowBytes() };
 
                 return LazyInstantiationResult(resourceProvider->createTexture(
-                        desc, format, renderable, sampleCnt, budgeted, fit, GrProtected::kNo, ct,
-                        mipLevel, GrResourceProvider::Flags::kNoPendingIO));
+                        desc, format, GrRenderable::kNo, sampleCnt, budgeted, fit, GrProtected::kNo,
+                        ct, mipLevel, GrResourceProvider::Flags::kNoPendingIO));
             },
-            format, desc, renderable, sampleCnt, kTopLeft_GrSurfaceOrigin, GrMipMapped::kNo,
+            format, desc, GrRenderable::kNo, sampleCnt, kTopLeft_GrSurfaceOrigin, GrMipMapped::kNo,
             GrMipMapsStatus::kNotAllocated, surfaceFlags, fit, budgeted, GrProtected::kNo);
 
     if (!proxy) {
@@ -377,8 +369,8 @@
     // If mips weren't requested (or this was too small to have any), then take the fast path
     if (GrMipMapped::kNo == mipMapped ||
         0 == SkMipMap::ComputeLevelCount(baseLevel->width(), baseLevel->height())) {
-        return this->createTextureProxy(std::move(baseLevel), GrRenderable::kNo, 1,
-                                        SkBudgeted::kYes, SkBackingFit::kExact);
+        return this->createTextureProxy(std::move(baseLevel), 1, SkBudgeted::kYes,
+                                        SkBackingFit::kExact);
     }
 
     GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(bitmap.info());