Account for updated GrVkFormatToPixelConfig signature. (flutter#3615)

Fixes Vulkan backend.
JackCho · Apr 21, 2017 · 9740093 · 9740093
1 parent c447413
commit 9740093
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
@@ -281,7 +281,8 @@ bool VulkanDevice::ChooseSurfaceFormat(const VulkanSurface& surface,
   std::map<VkFormat, VkSurfaceFormatKHR> supported_formats;
 
   for (uint32_t i = 0; i < format_count; i++) {
-    if (GrVkFormatToPixelConfig(formats[i].format, nullptr /* dont care */)) {
+    GrPixelConfig pixel_config = GrVkFormatToPixelConfig(formats[i].format);
+    if (pixel_config != kUnknown_GrPixelConfig) {
       supported_formats[formats[i].format] = formats[i];
     }
   }

diff --git a/vulkan/vulkan_swapchain.cc b/vulkan/vulkan_swapchain.cc
@@ -189,9 +189,9 @@ sk_sp<SkSurface> VulkanSwapchain::CreateSkiaSurface(GrContext* gr_context,
     return nullptr;
   }
 
-  GrPixelConfig pixel_config = kUnknown_GrPixelConfig;
+  GrPixelConfig pixel_config = GrVkFormatToPixelConfig(surface_format_.format);
 
-  if (!GrVkFormatToPixelConfig(surface_format_.format, &pixel_config)) {
+  if (pixel_config == kUnknown_GrPixelConfig) {
     // Vulkan format unsupported by Skia.
     return nullptr;
   }