commit ba5c7adfef1a44c3419d5a5110f1a9a49a2dbdd7
author Robert Phillips <robertphillips@google.com> Fri Jan 24 11:03:33 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 24 16:30:47 2020 +0000
tree a29389850579db6960714de10b4b8c61bd9c6ac8
parent 2f2c77ae7972984e93a3571630c98d8bb671b351

Make GrGpu::createBackendTexture match createCompressedBackendTexture

This is pulled out of the omnibus parameter reordering CL - which has become too large.

Change-Id: Ia647f4aac9f31600c6f72098233fe401895f23df
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266537
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 0a1e2f5..c9f95bb 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -380,13 +380,8 @@
         return GrBackendTexture();
     }
 
-    int numMipLevels = 1;
-    if (mipMapped == GrMipMapped::kYes) {
-        numMipLevels = SkMipMap::ComputeLevelCount(width, height) + 1;
-    }
-
     return fGpu->createBackendTexture({width, height}, backendFormat, renderable,
-                                      numMipLevels, isProtected, nullptr);
+                                      mipMapped, isProtected, nullptr);
 }
 
 GrBackendTexture GrContext::createBackendTexture(int width, int height,
@@ -485,13 +480,9 @@
         return GrBackendTexture();
     }
 
-    int numMipLevels = 1;
-    if (mipMapped == GrMipMapped::kYes) {
-        numMipLevels = SkMipMap::ComputeLevelCount(width, height) + 1;
-    }
     GrGpu::BackendTextureData data(color);
     return fGpu->createBackendTexture({width, height}, backendFormat, renderable,
-                                      numMipLevels, isProtected, &data);
+                                      mipMapped, isProtected, &data);
 }
 
 GrBackendTexture GrContext::createBackendTexture(int width, int height,
@@ -520,7 +511,7 @@
                                       isProtected);
 }
 
-GrBackendTexture GrContext::createBackendTexture(const SkPixmap srcData[], int numLevels,
+GrBackendTexture GrContext::createBackendTexture(const SkPixmap srcData[], int numProvidedLevels,
                                                  GrRenderable renderable, GrProtected isProtected) {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
 
@@ -532,7 +523,7 @@
         return {};
     }
 
-    if (!srcData || !numLevels) {
+    if (!srcData || numProvidedLevels <= 0) {
         return {};
     }
 
@@ -540,11 +531,22 @@
     int baseHeight = srcData[0].height();
     SkColorType colorType = srcData[0].colorType();
 
+    GrMipMapped mipMapped = GrMipMapped::kNo;
+    int numExpectedLevels = 1;
+    if (numProvidedLevels > 1) {
+        numExpectedLevels = SkMipMap::ComputeLevelCount(baseWidth, baseHeight) + 1;
+        mipMapped = GrMipMapped::kYes;
+    }
+
+    if (numProvidedLevels != numExpectedLevels) {
+        return {};
+    }
+
     GrBackendFormat backendFormat = this->defaultBackendFormat(colorType, renderable);
 
     GrGpu::BackendTextureData data(srcData);
     return fGpu->createBackendTexture({baseWidth, baseHeight}, backendFormat, renderable,
-                                      numLevels, isProtected, &data);
+                                      mipMapped, isProtected, &data);
 }
 
 //////////////////////////////////////////////////////////////////////////////