commit 3da9e94289c6ff9500ef1bd27b04a36be8ac3419
author Robert Phillips <robertphillips@google.com> Mon Jan 27 21:05:23 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jan 27 21:05:46 2020 +0000
tree 40f2a53e24a192a2b51672651f35d50edd35d66b
parent 36d6c599c314e39821118ee9dbe0e02f02fb5a54

Revert "Add SkImage::MakeRasterFromCompressed and make MakeFromCompressed fall back to decompression for unsupported compression types"

This reverts commit 3234ce1347c5c258068a58a1f36a56934f752a52.

Reason for revert: missing etc1.h

Original change's description:
> Add SkImage::MakeRasterFromCompressed and make MakeFromCompressed fall back to decompression for unsupported compression types
> 
> 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.
> 
> Change-Id: Ieed008f083d6e3594eaa9a02bc5348e00ee60d2a
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265601
> Reviewed-by: Mike Reed <reed@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reed@google.com

Change-Id: Ia497e6767c43ab6f8bfeb28e70244107a1442cf2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266937
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 fe93a3f..b876991 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -8,7 +8,6 @@
 #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"
@@ -36,8 +35,7 @@
 
     SkImage::CompressionType compressionType = caps.compressionType(format);
     if (compressionType != SkImage::CompressionType::kNone) {
-        colorSize = SkCompressedFormatDataSize(compressionType, dimensions,
-                                               mipMapped == GrMipMapped::kYes);
+        colorSize = GrCompressedFormatDataSize(compressionType, dimensions, mipMapped);
     } else {
         colorSize = (size_t)dimensions.width() * dimensions.height() * caps.bytesPerPixel(format);
     }