venus: enable VK_KHR_push_descriptor

Signed-off-by: Dawn Han <dawnhan@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18988>
(cherry picked from commit 505a5bc79fa051781878df32603a505356c389bd)

diff --git a/.pick_status.json b/.pick_status.json
index d6c30d3..7dc7780 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2569,7 +2569,7 @@
         "description": "venus: enable VK_KHR_push_descriptor",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },

diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 9b7e5ec..e45fd5e 100644 (file)
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -512,6 +512,9 @@ vn_physical_device_init_properties(struct vn_physical_device *physical_dev)
       VN_ADD_PNEXT_EXT(props2, TEXEL_BUFFER_ALIGNMENT_PROPERTIES, local_props.texel_buffer_alignment, exts->EXT_texel_buffer_alignment);
    }
 
+   /* KHR */
+   VN_ADD_PNEXT_EXT(props2, PUSH_DESCRIPTOR_PROPERTIES_KHR, props->push_descriptor, exts->KHR_push_descriptor);
+
    /* EXT */
    VN_ADD_PNEXT_EXT(props2, CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT, props->conservative_rasterization, exts->EXT_conservative_rasterization);
    VN_ADD_PNEXT_EXT(props2, CUSTOM_BORDER_COLOR_PROPERTIES_EXT, props->custom_border_color, exts->EXT_custom_border_color);
@@ -1073,6 +1076,9 @@ vn_physical_device_get_passthrough_extensions(
       .EXT_texture_compression_astc_hdr = true,
       .EXT_ycbcr_2plane_444_formats = true,
 
+      /* KHR */
+      .KHR_push_descriptor = true,
+
       /* EXT */
       .EXT_calibrated_timestamps = true,
       .EXT_conditional_rendering = true,
@@ -1773,6 +1779,9 @@ vn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
 
          /* clang-format off */
 
+      /* KHR */
+      CASE(PUSH_DESCRIPTOR_PROPERTIES_KHR, push_descriptor);
+
       /* EXT */
       CASE(CONSERVATIVE_RASTERIZATION_PROPERTIES_EXT, conservative_rasterization);
       CASE(CUSTOM_BORDER_COLOR_PROPERTIES_EXT, custom_border_color);

diff --git a/src/virtio/vulkan/vn_physical_device.h b/src/virtio/vulkan/vn_physical_device.h
index 663ab0e..ac89934 100644 (file)
--- a/src/virtio/vulkan/vn_physical_device.h
+++ b/src/virtio/vulkan/vn_physical_device.h
@@ -58,6 +58,9 @@ struct vn_physical_device_properties {
    VkPhysicalDeviceVulkan12Properties vulkan_1_2;
    VkPhysicalDeviceVulkan13Properties vulkan_1_3;
 
+   /* KHR */
+   VkPhysicalDevicePushDescriptorPropertiesKHR push_descriptor;
+
    /* EXT */
    VkPhysicalDeviceConservativeRasterizationPropertiesEXT
       conservative_rasterization;