From aa76b70751ae58e3f7617655e5203460bb615c56 Mon Sep 17 00:00:00 2001 From: Rebecca Mckeever Date: Fri, 9 Dec 2022 14:07:59 -0600 Subject: [PATCH] hasvk: Delete VK_KHR_device_group provided entrypoints Delete anv_CmdDispatch, anv_CmdSetDeviceMask, and anv_GetDeviceGroupPeerMemoryFeatures so that the vk_common_* versions will be used instead. This will avoid repeated code. Signed-off-by: Rebecca Mckeever Reviewed-by: Jason Ekstrand Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan_hasvk/anv_cmd_buffer.c | 7 ------- src/intel/vulkan_hasvk/anv_device.c | 15 --------------- src/intel/vulkan_hasvk/genX_cmd_buffer.c | 9 --------- 3 files changed, 31 deletions(-) diff --git a/src/intel/vulkan_hasvk/anv_cmd_buffer.c b/src/intel/vulkan_hasvk/anv_cmd_buffer.c index 6ab7f4d..018e13b 100644 --- a/src/intel/vulkan_hasvk/anv_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/anv_cmd_buffer.c @@ -846,10 +846,3 @@ void anv_CmdPushDescriptorSetWithTemplateKHR( anv_cmd_buffer_bind_descriptor_set(cmd_buffer, template->bind_point, layout, _set, set, NULL, NULL); } - -void anv_CmdSetDeviceMask( - VkCommandBuffer commandBuffer, - uint32_t deviceMask) -{ - /* No-op */ -} diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index 2f3142f..930816d 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -2412,21 +2412,6 @@ void anv_GetPhysicalDeviceMemoryProperties2( } } -void -anv_GetDeviceGroupPeerMemoryFeatures( - VkDevice device, - uint32_t heapIndex, - uint32_t localDeviceIndex, - uint32_t remoteDeviceIndex, - VkPeerMemoryFeatureFlags* pPeerMemoryFeatures) -{ - assert(localDeviceIndex == 0 && remoteDeviceIndex == 0); - *pPeerMemoryFeatures = VK_PEER_MEMORY_FEATURE_COPY_SRC_BIT | - VK_PEER_MEMORY_FEATURE_COPY_DST_BIT | - VK_PEER_MEMORY_FEATURE_GENERIC_SRC_BIT | - VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT; -} - PFN_vkVoidFunction anv_GetInstanceProcAddr( VkInstance _instance, const char* pName) diff --git a/src/intel/vulkan_hasvk/genX_cmd_buffer.c b/src/intel/vulkan_hasvk/genX_cmd_buffer.c index 141d59a..984ae42 100644 --- a/src/intel/vulkan_hasvk/genX_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/genX_cmd_buffer.c @@ -4512,15 +4512,6 @@ anv_cmd_buffer_push_base_group_id(struct anv_cmd_buffer *cmd_buffer, } } -void genX(CmdDispatch)( - VkCommandBuffer commandBuffer, - uint32_t x, - uint32_t y, - uint32_t z) -{ - genX(CmdDispatchBase)(commandBuffer, 0, 0, 0, x, y, z); -} - static inline void emit_gpgpu_walker(struct anv_cmd_buffer *cmd_buffer, const struct anv_compute_pipeline *pipeline, bool indirect, -- 2.7.4