commit 99dead98309c8fe6e242da7c3bef63b4ac312a6e
author Robert Phillips <robertphillips@google.com> Mon Jan 27 16:11:57 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 28 14:03:14 2020 +0000
tree 4d24c8e6e588e5f85a703df3b766040c061de098
parent 9f8c6ea7afc89aa9d54fc1013cd239e534b7397b

Add SkImage::MakeRasterFromCompressed and make MakeFromCompressed fall back to decompression for unsupported compression types (take 2)

This is intended to make using compressed textures easier since developers can just provided compressed data and it will be uploaded to the GPU in some way, shape or form.


TBR=reed@google.com
Change-Id: I8c672ccc7db5cd098f629c3469ae7cbdc7436392
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266939
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrSurface.cpp

diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index b876991..fe93a3f 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -8,6 +8,7 @@
 #include "include/gpu/GrContext.h"
 #include "include/gpu/GrSurface.h"
 #include "include/gpu/GrTexture.h"
+#include "src/core/SkCompressedDataUtils.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSurfacePriv.h"
@@ -35,7 +36,8 @@
 
     SkImage::CompressionType compressionType = caps.compressionType(format);
     if (compressionType != SkImage::CompressionType::kNone) {
-        colorSize = GrCompressedFormatDataSize(compressionType, dimensions, mipMapped);
+        colorSize = SkCompressedFormatDataSize(compressionType, dimensions,
+                                               mipMapped == GrMipMapped::kYes);
     } else {
         colorSize = (size_t)dimensions.width() * dimensions.height() * caps.bytesPerPixel(format);
     }