From 417de28e43cc4429363492ab85c4fc53b3ca5a2a Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Sun, 12 Feb 2023 19:45:28 -0800
Subject: [PATCH] venus: further disallow sparse resource

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21379>
---
 src/virtio/vulkan/vn_image.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/virtio/vulkan/vn_image.c b/src/virtio/vulkan/vn_image.c
index 55566f1..e9ee912 100644
--- a/src/virtio/vulkan/vn_image.c
+++ b/src/virtio/vulkan/vn_image.c
@@ -418,17 +418,13 @@ vn_GetImageMemoryRequirements2(VkDevice device,
 
 void
 vn_GetImageSparseMemoryRequirements2(
-   VkDevice device,
-   const VkImageSparseMemoryRequirementsInfo2 *pInfo,
+   UNUSED VkDevice device,
+   UNUSED const VkImageSparseMemoryRequirementsInfo2 *pInfo,
    uint32_t *pSparseMemoryRequirementCount,
-   VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements)
+   UNUSED VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements)
 {
-   struct vn_device *dev = vn_device_from_handle(device);
-
-   /* TODO per-device cache */
-   vn_call_vkGetImageSparseMemoryRequirements2(dev->instance, device, pInfo,
-                                               pSparseMemoryRequirementCount,
-                                               pSparseMemoryRequirements);
+   /* see vn_GetPhysicalDeviceSparseImageFormatProperties2 */
+   *pSparseMemoryRequirementCount = 0;
 }
 
 static void
@@ -764,15 +760,11 @@ vn_GetDeviceImageMemoryRequirements(
 
 void
 vn_GetDeviceImageSparseMemoryRequirements(
-   VkDevice device,
-   const VkDeviceImageMemoryRequirements *pInfo,
+   UNUSED VkDevice device,
+   UNUSED const VkDeviceImageMemoryRequirements *pInfo,
    uint32_t *pSparseMemoryRequirementCount,
-   VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements)
+   UNUSED VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements)
 {
-   struct vn_device *dev = vn_device_from_handle(device);
-
-   /* TODO per-device cache */
-   vn_call_vkGetDeviceImageSparseMemoryRequirements(
-      dev->instance, device, pInfo, pSparseMemoryRequirementCount,
-      pSparseMemoryRequirements);
+   /* see vn_GetPhysicalDeviceSparseImageFormatProperties2 */
+   *pSparseMemoryRequirementCount = 0;
 }
-- 
2.7.4