commit e4720c68649c9a8651f8ec2e7eb5e739b1d4c96c
author Robert Phillips <robertphillips@google.com> Tue Jan 14 14:33:24 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 14 20:57:28 2020 +0000
tree b7cd342a2549611c347e828b43dcd56e24c57068
parent c46e30e5683bbba544610ef3b8cb98e761b2c085

Expand SkImage::MakeFromCompressed to support mipMapping

Bug: skia:9680
Change-Id: I41357439cdc087e4cc98d5d1659ae2ee19f49004
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/264398
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/vk/GrVkGpu.h

diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index 9721cec..ae61252 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -194,7 +194,7 @@
                                      int mipLevelCount,
                                      uint32_t levelClearMask) override;
     sk_sp<GrTexture> onCreateCompressedTexture(SkISize dimensions, const GrBackendFormat&,
-                                               SkBudgeted, const void* data,
+                                               SkBudgeted, GrMipMapped, const void* data,
                                                size_t dataSize) override;
 
     sk_sp<GrTexture> onWrapBackendTexture(const GrBackendTexture&, GrColorType, GrWrapOwnership,
@@ -264,8 +264,8 @@
                              GrColorType colorType, const void* data, size_t rowBytes);
     bool uploadTexDataOptimal(GrVkTexture* tex, int left, int top, int width, int height,
                               GrColorType colorType, const GrMipLevel texels[], int mipLevelCount);
-    bool uploadTexDataCompressed(GrVkTexture* tex, int left, int top, int width, int height,
-                                 const void* data, size_t dataSize);
+    bool uploadTexDataCompressed(GrVkTexture* tex, VkFormat vkFormat, SkISize dimensions,
+                                 GrMipMapped mipMapped, const void* data, size_t dataSize);
     void resolveImage(GrSurface* dst, GrVkRenderTarget* src, const SkIRect& srcRect,
                       const SkIPoint& dstPoint);