Clean up cruft left over from addition GrGpu::createBackendTexture chokepoint
The choke point now checks all the deleted conditions.
Change-Id: I064b107a09fdfeccf1cdf04b1b58a3c617c9ac96
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/243697
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrContextPriv.cpp b/src/gpu/GrContextPriv.cpp
index db64798..5507b43 100644
--- a/src/gpu/GrContextPriv.cpp
+++ b/src/gpu/GrContextPriv.cpp
@@ -362,36 +362,11 @@
int baseHeight = srcData[0].height();
SkColorType colorType = srcData[0].colorType();
- if (numLevels > 1) {
- if (numLevels != SkMipMap::ComputeLevelCount(baseWidth, baseHeight) + 1) {
- return {};
- }
-
- int currentWidth = baseWidth;
- int currentHeight = baseHeight;
- for (int i = 1; i < numLevels; ++i) {
- currentWidth = SkTMax(1, currentWidth / 2);
- currentHeight = SkTMax(1, currentHeight / 2);
-
- if (srcData[i].colorType() != colorType) {
- return {};
- }
-
- if (srcData[i].width() != currentWidth || srcData[i].height() != currentHeight) {
- return {};
- }
- }
- }
-
GrBackendFormat backendFormat = fContext->defaultBackendFormat(colorType, renderable);
- if (!backendFormat.isValid()) {
- return {};
- }
GrGpu* gpu = fContext->fGpu.get();
- // TODO: propagate the array of pixmaps interface to GrGpu
return gpu->createBackendTexture(baseWidth, baseHeight, backendFormat,
- GrMipMapped::kNo, // TODO: use real mipmap setting here
+ numLevels > 1 ? GrMipMapped::kYes : GrMipMapped::kNo,
renderable, srcData, numLevels, nullptr, isProtected);
}