commit 4eb38b768400c3f0c712da3c4e659481ea765890
author Brian Salomon <bsalomon@google.com> Mon Aug 05 12:58:39 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Aug 05 17:33:17 2019 +0000
tree 099c5dbc11333495abcb66845b32916e8a41c97d
parent ee2378a717cc807e6302634c0f593680f8f0adc7

Pass GrBackendFormat to GrResourceProvider and GrGpu texture create
functions.

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

src/gpu/GrGpu.cpp

diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 280885f..6130312 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -144,10 +144,10 @@
     return levelsWithPixelsCnt == mipLevelCount;
 }
 
-sk_sp<GrTexture> GrGpu::createTexture(const GrSurfaceDesc& origDesc, GrRenderable renderable,
-                                      int renderTargetSampleCnt, SkBudgeted budgeted,
-                                      GrProtected isProtected, const GrMipLevel texels[],
-                                      int mipLevelCount) {
+sk_sp<GrTexture> GrGpu::createTexture(const GrSurfaceDesc& origDesc, const GrBackendFormat& format,
+                                      GrRenderable renderable, int renderTargetSampleCnt,
+                                      SkBudgeted budgeted, GrProtected isProtected,
+                                      const GrMipLevel texels[], int mipLevelCount) {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
     if (GrPixelConfigIsCompressed(origDesc.fConfig)) {
         // Call GrGpu::createCompressedTexture.
@@ -191,15 +191,17 @@
                 fStats.incTextureUploads();
             }
         }
+        //  TODO: Assert this once format is passed to onCreateTexture().
+        //  SkASSERT(tex->backendFormat() == format);
     }
     return tex;
 }
 
-sk_sp<GrTexture> GrGpu::createTexture(const GrSurfaceDesc& desc, GrRenderable renderable,
-                                      int renderTargetSampleCnt, SkBudgeted budgeted,
-                                      GrProtected isProtected) {
-    return this->createTexture(desc, renderable, renderTargetSampleCnt, budgeted, isProtected,
-                               nullptr, 0);
+sk_sp<GrTexture> GrGpu::createTexture(const GrSurfaceDesc& desc, const GrBackendFormat& format,
+                                      GrRenderable renderable, int renderTargetSampleCnt,
+                                      SkBudgeted budgeted, GrProtected isProtected) {
+    return this->createTexture(desc, format, renderable, renderTargetSampleCnt, budgeted,
+                               isProtected, nullptr, 0);
 }
 
 sk_sp<GrTexture> GrGpu::createCompressedTexture(int width, int height,