commit 1676cb92820270a301b3f91745d9e5426fe23c7a
author Jim Van Verth <jvanverth@google.com> Tue Jan 15 13:24:45 2019 -0500
committer Jim Van Verth <jvanverth@google.com> Tue Jan 15 19:56:28 2019 +0000
tree 5c94f9eb0d9b259d6426660beb8cacf655f7e290
parent 98dea7b11c239559548718783e0e3205a8bea23e

Restore ETC1 compressed texture support.

Brings back GL ETC1 support and adds Vulkan support as well.

Bug: skia:8684
Change-Id: Ie65da0a3172793081f0e4072f161bfb9b14678bc
Reviewed-on: https://skia-review.googlesource.com/c/179724
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrTextureProducer.cpp

diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index 97417f9..9ae2eb4 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -23,6 +23,8 @@
                                                    bool dstWillRequireMipMaps) {
     SkASSERT(context);
 
+    GrPixelConfig config = GrMakePixelConfigUncompressed(inputProxy->config());
+
     const SkRect dstRect = SkRect::MakeIWH(copyParams.fWidth, copyParams.fHeight);
     GrMipMapped mipMapped = dstWillRequireMipMaps ? GrMipMapped::kYes : GrMipMapped::kNo;
 
@@ -52,7 +54,7 @@
     sk_sp<GrRenderTargetContext> copyRTC =
         context->contextPriv().makeDeferredRenderTargetContextWithFallback(
             format, SkBackingFit::kExact, dstRect.width(), dstRect.height(),
-            inputProxy->config(), nullptr, 1, mipMapped, inputProxy->origin());
+            config, nullptr, 1, mipMapped, inputProxy->origin());
     if (!copyRTC) {
         return nullptr;
     }