commit f6df08ebe6bf3380bdf2b3495eadd9793643172a
author Ian Elliott <ianelliott@google.com> Wed Mar 16 21:27:49 2022 -0600
committer Ian Elliott <ianelliott@google.com> Wed Mar 16 21:27:49 2022 -0600
tree 65881358e3fd7d34fef4dda12b4edf62398a32d5
parent b96ec446c81df401afa5e865c36e8d7d8413bf1e

swapchain: Eliminate silly difference with AOSP

Bug: 203826952
Test: Manual inspection
Change-Id: Ica37bbb2280e98a50db3359cc97291b5ca449cc1

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 72696ad..96da1b0 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -719,6 +719,8 @@
 
     bool wide_color_support = false;
     uint64_t consumer_usage = 0;
+    bool swapchain_ext =
+        instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);
     if (surface_handle == VK_NULL_HANDLE) {
         ProcHook::Extension surfaceless = ProcHook::GOOGLE_surfaceless_query;
         bool surfaceless_enabled =
@@ -746,9 +748,7 @@
 
         consumer_usage = surface.consumer_usage;
     }
-    wide_color_support =
-        wide_color_support &&
-        instance_data.hook_extensions.test(ProcHook::EXT_swapchain_colorspace);
+    wide_color_support = wide_color_support && swapchain_ext;
 
     AHardwareBuffer_Desc desc = {};
     desc.width = 1;