commit 81b8059d8b8c87aed19f773a4cc59f4528122d67
author Greg Daniel <egdaniel@google.com> Wed Dec 13 10:20:04 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 13 15:46:12 2017 +0000
tree 496e34e60bf5d28ac7f30a27aa6a5fc42cae041c
parent c25db637532cd10dde7855d868c0d033e96f61f2

Start removing uses of VkFormatToPixelConfig in vulkan backend

Bug: skia:
Change-Id: I2c8e86b9e8ca6a33913be347a3c65af963c5fd12
Reviewed-on: https://skia-review.googlesource.com/84341
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/vk/GrVkGpu.cpp

diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 319e188..5fdf58e 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -898,7 +898,7 @@
         return false;
     }
 
-    SkASSERT(config == GrVkFormatToPixelConfig(info->fFormat));
+    SkASSERT(GrVkFormatPixelConfigPairIsValid(info->fFormat, config));
     return true;
 }
 
@@ -1072,7 +1072,7 @@
     }
 
     // setup memory barrier
-    SkASSERT(kUnknown_GrPixelConfig != GrVkFormatToPixelConfig(tex->imageFormat()));
+    SkASSERT(GrVkFormatIsSupported(tex->imageFormat()));
     VkImageAspectFlags aspectFlags = VK_IMAGE_ASPECT_COLOR_BIT;
     VkImageMemoryBarrier imageMemoryBarrier = {
         VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,          // sType