commit 0869c1334eb62e879a06bb690f7b4e0a5a5946cc
author Chris Forbes <chrisforbes@google.com> Wed Jun 05 13:49:11 2024 +1200
committer Chris Forbes <chrisforbes@google.com> Wed Jun 05 13:49:11 2024 +1200
tree 0517ed9e3c8baa410d167afd99239d44682382cb
parent 03a8ff5c5ce9c6d8a4fd61cf44c057ca77c6c16a

Dispatch properly to either GPDIFP2 or KHR variant

The KHR function pointer may not be populated. We can accept either.

Bug: b/341758459
Change-Id: Idc7f2db78dff35d6120dab35bb5f25a7fa81ccb4

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 74d3d9d..9e67725 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -1174,7 +1174,8 @@
                             pSurfaceFormat);
 
                     if (surfaceCompressionProps &&
-                        driver.GetPhysicalDeviceImageFormatProperties2KHR) {
+                        (driver.GetPhysicalDeviceImageFormatProperties2KHR ||
+                         driver.GetPhysicalDeviceImageFormatProperties2)) {
                         VkPhysicalDeviceImageFormatInfo2 imageFormatInfo = {};
                         imageFormatInfo.sType =
                             VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2;
@@ -1205,7 +1206,7 @@
                         imageFormatProps.pNext = &compressionProps;
 
                         VkResult compressionRes =
-                            driver.GetPhysicalDeviceImageFormatProperties2KHR(
+                            GetPhysicalDeviceImageFormatProperties2(
                                 physicalDevice, &imageFormatInfo,
                                 &imageFormatProps);
                         if (compressionRes == VK_SUCCESS) {