UPSTREAM: venus: Use trivial common entrypoints
BUG=b:238580844
BUG=b:239368032
TEST=dEQP-VK.api.info.sparse_image_format_properties2.*
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15613>
(cherry picked from commit a8c7e8fef84b5ed026e313859a0067aa3b6b2499)
Change-Id: I9708ebcb3688cd8e1e0afd10b8db55d8fc1a534d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/mesa/+/3775615
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Yiwei Zhang <zzyiwei@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org>
Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
diff --git a/src/virtio/vulkan/vn_buffer.c b/src/virtio/vulkan/vn_buffer.c
index e09d822..441bc04 100644
--- a/src/virtio/vulkan/vn_buffer.c
+++ b/src/virtio/vulkan/vn_buffer.c
@@ -413,16 +413,6 @@
}
void
-vn_GetBufferMemoryRequirements(VkDevice device,
- VkBuffer buffer,
- VkMemoryRequirements *pMemoryRequirements)
-{
- const struct vn_buffer *buf = vn_buffer_from_handle(buffer);
-
- *pMemoryRequirements = buf->requirements.memory.memoryRequirements;
-}
-
-void
vn_GetBufferMemoryRequirements2(VkDevice device,
const VkBufferMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
@@ -454,26 +444,6 @@
}
VkResult
-vn_BindBufferMemory(VkDevice device,
- VkBuffer buffer,
- VkDeviceMemory memory,
- VkDeviceSize memoryOffset)
-{
- struct vn_device *dev = vn_device_from_handle(device);
- struct vn_device_memory *mem = vn_device_memory_from_handle(memory);
-
- if (mem->base_memory) {
- memory = vn_device_memory_to_handle(mem->base_memory);
- memoryOffset += mem->base_offset;
- }
-
- vn_async_vkBindBufferMemory(dev->instance, device, buffer, memory,
- memoryOffset);
-
- return VK_SUCCESS;
-}
-
-VkResult
vn_BindBufferMemory2(VkDevice device,
uint32_t bindInfoCount,
const VkBindBufferMemoryInfo *pBindInfos)
diff --git a/src/virtio/vulkan/vn_image.c b/src/virtio/vulkan/vn_image.c
index 784d67f..7c953d7 100644
--- a/src/virtio/vulkan/vn_image.c
+++ b/src/virtio/vulkan/vn_image.c
@@ -368,31 +368,6 @@
}
void
-vn_GetImageMemoryRequirements(VkDevice device,
- VkImage image,
- VkMemoryRequirements *pMemoryRequirements)
-{
- const struct vn_image *img = vn_image_from_handle(image);
-
- *pMemoryRequirements = img->requirements[0].memory.memoryRequirements;
-}
-
-void
-vn_GetImageSparseMemoryRequirements(
- VkDevice device,
- VkImage image,
- uint32_t *pSparseMemoryRequirementCount,
- VkSparseImageMemoryRequirements *pSparseMemoryRequirements)
-{
- struct vn_device *dev = vn_device_from_handle(device);
-
- /* TODO per-device cache */
- vn_call_vkGetImageSparseMemoryRequirements(dev->instance, device, image,
- pSparseMemoryRequirementCount,
- pSparseMemoryRequirements);
-}
-
-void
vn_GetImageMemoryRequirements2(VkDevice device,
const VkImageMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements)
@@ -464,30 +439,6 @@
}
VkResult
-vn_BindImageMemory(VkDevice device,
- VkImage image,
- VkDeviceMemory memory,
- VkDeviceSize memoryOffset)
-{
- struct vn_device *dev = vn_device_from_handle(device);
- struct vn_image *img = vn_image_from_handle(image);
- struct vn_device_memory *mem = vn_device_memory_from_handle(memory);
-
- if (img->wsi.is_wsi)
- vn_image_bind_wsi_memory(img, mem);
-
- if (mem->base_memory) {
- memory = vn_device_memory_to_handle(mem->base_memory);
- memoryOffset += mem->base_offset;
- }
-
- vn_async_vkBindImageMemory(dev->instance, device, image, memory,
- memoryOffset);
-
- return VK_SUCCESS;
-}
-
-VkResult
vn_BindImageMemory2(VkDevice device,
uint32_t bindInfoCount,
const VkBindImageMemoryInfo *pBindInfos)
diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 67e6b4e..5d0f73c 100644
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -1497,44 +1497,6 @@
}
void
-vn_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice,
- VkPhysicalDeviceFeatures *pFeatures)
-{
- struct vn_physical_device *physical_dev =
- vn_physical_device_from_handle(physicalDevice);
-
- *pFeatures = physical_dev->features.vulkan_1_0;
-}
-
-void
-vn_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,
- VkPhysicalDeviceProperties *pProperties)
-{
- struct vn_physical_device *physical_dev =
- vn_physical_device_from_handle(physicalDevice);
-
- *pProperties = physical_dev->properties.vulkan_1_0;
-}
-
-void
-vn_GetPhysicalDeviceQueueFamilyProperties(
- VkPhysicalDevice physicalDevice,
- uint32_t *pQueueFamilyPropertyCount,
- VkQueueFamilyProperties *pQueueFamilyProperties)
-{
- struct vn_physical_device *physical_dev =
- vn_physical_device_from_handle(physicalDevice);
-
- VK_OUTARRAY_MAKE(out, pQueueFamilyProperties, pQueueFamilyPropertyCount);
- for (uint32_t i = 0; i < physical_dev->queue_family_count; i++) {
- vk_outarray_append(&out, props) {
- *props =
- physical_dev->queue_family_properties[i].queueFamilyProperties;
- }
- }
-}
-
-void
vn_GetPhysicalDeviceMemoryProperties(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties *pMemoryProperties)
@@ -1567,69 +1529,6 @@
}
void
-vn_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice,
- VkFormat format,
- VkFormatProperties *pFormatProperties)
-{
- struct vn_physical_device *physical_dev =
- vn_physical_device_from_handle(physicalDevice);
- struct vn_format_properties_entry *entry =
- vn_physical_device_get_format_properties(physical_dev, format);
-
- if (entry->valid) {
- *pFormatProperties = entry->properties;
- return;
- }
-
- vn_call_vkGetPhysicalDeviceFormatProperties(
- physical_dev->instance, physicalDevice, format, pFormatProperties);
-
- vn_physical_device_add_format_properties(physical_dev, entry,
- pFormatProperties);
-}
-
-VkResult
-vn_GetPhysicalDeviceImageFormatProperties(
- VkPhysicalDevice physicalDevice,
- VkFormat format,
- VkImageType type,
- VkImageTiling tiling,
- VkImageUsageFlags usage,
- VkImageCreateFlags flags,
- VkImageFormatProperties *pImageFormatProperties)
-{
- struct vn_physical_device *physical_dev =
- vn_physical_device_from_handle(physicalDevice);
-
- /* TODO per-device cache */
- VkResult result = vn_call_vkGetPhysicalDeviceImageFormatProperties(
- physical_dev->instance, physicalDevice, format, type, tiling, usage,
- flags, pImageFormatProperties);
-
- return vn_result(physical_dev->instance, result);
-}
-
-void
-vn_GetPhysicalDeviceSparseImageFormatProperties(
- VkPhysicalDevice physicalDevice,
- VkFormat format,
- VkImageType type,
- uint32_t samples,
- VkImageUsageFlags usage,
- VkImageTiling tiling,
- uint32_t *pPropertyCount,
- VkSparseImageFormatProperties *pProperties)
-{
- struct vn_physical_device *physical_dev =
- vn_physical_device_from_handle(physicalDevice);
-
- /* TODO per-device cache */
- vn_call_vkGetPhysicalDeviceSparseImageFormatProperties(
- physical_dev->instance, physicalDevice, format, type, samples, usage,
- tiling, pPropertyCount, pProperties);
-}
-
-void
vn_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures2 *pFeatures)
{
diff --git a/src/virtio/vulkan/vn_queue.c b/src/virtio/vulkan/vn_queue.c
index a381570..9501ba0 100644
--- a/src/virtio/vulkan/vn_queue.c
+++ b/src/virtio/vulkan/vn_queue.c
@@ -24,25 +24,6 @@
/* queue commands */
void
-vn_GetDeviceQueue(VkDevice device,
- uint32_t queueFamilyIndex,
- uint32_t queueIndex,
- VkQueue *pQueue)
-{
- struct vn_device *dev = vn_device_from_handle(device);
-
- for (uint32_t i = 0; i < dev->queue_count; i++) {
- struct vn_queue *queue = &dev->queues[i];
- if (queue->family == queueFamilyIndex && queue->index == queueIndex) {
- assert(!queue->flags);
- *pQueue = vn_queue_to_handle(queue);
- return;
- }
- }
- unreachable("bad queue family/index");
-}
-
-void
vn_GetDeviceQueue2(VkDevice device,
const VkDeviceQueueInfo2 *pQueueInfo,
VkQueue *pQueue)