Have Vulkan advertise that compressed textures are currently unsupported

This allows the ProxyTest to run on the Vulkan backend.

Change-Id: I89a3212bdc2d4a1ceb0c27d0ff60f558d7b12647
Reviewed-on: https://skia-review.googlesource.com/7880
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

2 files changed, 11 insertions, 4 deletions

diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 383d3caf49..04f0eaa6b9 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -255,6 +255,17 @@ void GrVkCaps::initConfigTable(const GrVkInterface* interface, VkPhysicalDevice
             fConfigTable[i].init(interface, physDev, format);
         }
     }
+
+    // We currently do not support compressed textures in Vulkan
+    const uint16_t kFlagsToRemove = ConfigInfo::kTextureable_Flag|ConfigInfo::kRenderable_Flag;
+    fConfigTable[kETC1_GrPixelConfig].fOptimalFlags &= ~kFlagsToRemove;
+    fConfigTable[kETC1_GrPixelConfig].fLinearFlags &= ~kFlagsToRemove;
+    fConfigTable[kLATC_GrPixelConfig].fOptimalFlags &= ~kFlagsToRemove;
+    fConfigTable[kLATC_GrPixelConfig].fLinearFlags &= ~kFlagsToRemove;
+    fConfigTable[kR11_EAC_GrPixelConfig].fOptimalFlags &= ~kFlagsToRemove;
+    fConfigTable[kR11_EAC_GrPixelConfig].fLinearFlags &= ~kFlagsToRemove;
+    fConfigTable[kASTC_12x12_GrPixelConfig].fOptimalFlags &= ~kFlagsToRemove;
+    fConfigTable[kASTC_12x12_GrPixelConfig].fLinearFlags &= ~kFlagsToRemove;
 }
 
 void GrVkCaps::ConfigInfo::InitConfigFlags(VkFormatFeatureFlags vkFlags, uint16_t* flags) {
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 0fa303428b..8396b52625 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -109,10 +109,6 @@ static void check_texture(skiatest::Reporter* reporter,
 
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) {
-    if (ctxInfo.backend() == kVulkan_GrBackend) {
-        return;
-    }
-
     GrTextureProvider* provider = ctxInfo.grContext()->textureProvider();
     const GrCaps& caps = *ctxInfo.grContext()->caps();