commit b0855273ab7bf62d43b45ed141ca4b175e2aa8da
author Robert Phillips <robertphillips@google.com> Wed Jan 15 12:56:52 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 16 21:45:33 2020 +0000
tree 354ce2151bf2e7060f6b86eb05e40a626ec0c79a
parent b53bdf16aa8fa2454697afaa0c3f03df7581f17c

Add SkImage::CompressionType::kBC1_RGBA8_UNORM support

This is mainly so we can test the compression code on macOS.

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

src/gpu/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index f26dbfc..e772d6a 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -603,6 +603,8 @@
         return nullptr;
     }
 
+    const GrCaps* caps = this->caps();
+
     GrResourceProvider* resourceProvider = direct->priv().resourceProvider();
 
     sk_sp<GrTexture> tex = resourceProvider->wrapCompressedBackendTexture(beTex, ownership,
@@ -619,8 +621,10 @@
     // Make sure we match how we created the proxy with SkBudgeted::kNo
     SkASSERT(GrBudgetedType::kBudgeted != tex->resourcePriv().budgetedType());
 
-    // TODO: this will need to be changed for compressed RGBA formats
-    GrSwizzle texSwizzle = GrSwizzle::RGB1();
+    SkImage::CompressionType compressionType = caps->compressionType(beTex.getBackendFormat());
+
+    GrSwizzle texSwizzle = GrCompressionTypeIsOpaque(compressionType) ? GrSwizzle::RGB1()
+                                                                      : GrSwizzle::RGBA();
 
     return sk_sp<GrTextureProxy>(
         new GrTextureProxy(std::move(tex), origin, texSwizzle, UseAllocator::kNo));