From dc1069b16745c3b0dadf1d9c741ffdb1cb36ef69 Mon Sep 17 00:00:00 2001
From: Juston Li <justonli@google.com>
Date: Thu, 14 Mar 2024 16:14:07 -0700
Subject: [PATCH] venus: extend device format prop cache with
 VkFormatProperties3

Extend the vkGetPhysicalDeviceFormatProperties2 cache to include
VkFormatProperties3 from the pNext chain. VkFormatProperties3 was
observed being always attached for DXVK and thus skipping the cache
if not handled.

Signed-off-by: Juston Li <justonli@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28194>
---
 src/virtio/vulkan/vn_physical_device.c | 37 ++++++++++++++++++++++----
 src/virtio/vulkan/vn_physical_device.h |  2 ++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 5d59ef48339..4c0b3ea45a7 100644
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -1805,13 +1805,20 @@ static void
 vn_physical_device_add_format_properties(
    struct vn_physical_device *physical_dev,
    struct vn_format_properties_entry *entry,
-   const VkFormatProperties *props)
+   const VkFormatProperties *props,
+   const VkFormatProperties3 *props3)
 {
    simple_mtx_lock(&physical_dev->format_update_mutex);
    if (!entry->valid) {
       entry->properties = *props;
       entry->valid = true;
    }
+
+   if (props3 && !entry->props3_valid) {
+      entry->properties3 = *props3;
+      entry->props3_valid = true;
+   }
+
    simple_mtx_unlock(&physical_dev->format_update_mutex);
 }
 
@@ -1975,12 +1982,32 @@ vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
       vn_physical_device_from_handle(physicalDevice);
    struct vn_ring *ring = physical_dev->instance->ring.ring;
 
+   /* VkFormatProperties3 is cached if its the only struct in pNext */
+   VkFormatProperties3 *props3 = NULL;
+   if (pFormatProperties->pNext) {
+      const VkBaseOutStructure *base = pFormatProperties->pNext;
+      if (base->sType == VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_3 &&
+          base->pNext == NULL) {
+         props3 = (VkFormatProperties3 *)base;
+      }
+   }
+
    struct vn_format_properties_entry *entry = NULL;
-   if (!pFormatProperties->pNext) {
+   if (!pFormatProperties->pNext || props3) {
       entry = vn_physical_device_get_format_properties(physical_dev, format);
       if (entry->valid) {
-         pFormatProperties->formatProperties = entry->properties;
-         return;
+         const bool has_valid_props3 = props3 && entry->props3_valid;
+         if (has_valid_props3)
+            *props3 = entry->properties3;
+
+         /* Make the host call if our cache doesn't have props3 but the app
+          * now requests it.
+          */
+         if (!props3 || has_valid_props3) {
+            pFormatProperties->formatProperties = entry->properties;
+            pFormatProperties->pNext = props3;
+            return;
+         }
       }
    }
 
@@ -1989,7 +2016,7 @@ vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
 
    if (entry) {
       vn_physical_device_add_format_properties(
-         physical_dev, entry, &pFormatProperties->formatProperties);
+         physical_dev, entry, &pFormatProperties->formatProperties, props3);
    }
 }
 
diff --git a/src/virtio/vulkan/vn_physical_device.h b/src/virtio/vulkan/vn_physical_device.h
index 099a5648a65..a4f4d0f3d49 100644
--- a/src/virtio/vulkan/vn_physical_device.h
+++ b/src/virtio/vulkan/vn_physical_device.h
@@ -47,6 +47,8 @@ struct vn_physical_device_properties {
 struct vn_format_properties_entry {
    atomic_bool valid;
    VkFormatProperties properties;
+   atomic_bool props3_valid;
+   VkFormatProperties3 properties3;
 };
 
 struct vn_image_format_properties {