From 6b1e2e9eb69e3a3fbafcd662345b666d586e28f3 Mon Sep 17 00:00:00 2001 From: Rebecca Mckeever Date: Fri, 9 Dec 2022 14:07:17 -0600 Subject: [PATCH] v3dv: Delete VK_KHR_device_group provided entrypoints Delete v3dv_CmdDispatch, v3dv_CmdSetDeviceMask, and v3dv_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 Part-of: --- src/broadcom/vulkan/v3dv_cmd_buffer.c | 20 -------------------- src/broadcom/vulkan/v3dv_device.c | 14 -------------- src/broadcom/vulkan/v3dv_event.c | 6 ++++-- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c index 7d5aaf19bae..0d64189fdec 100644 --- a/src/broadcom/vulkan/v3dv_cmd_buffer.c +++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c @@ -3956,19 +3956,6 @@ cmd_buffer_dispatch(struct v3dv_cmd_buffer *cmd_buffer, cmd_buffer->state.job = NULL; } -VKAPI_ATTR void VKAPI_CALL -v3dv_CmdDispatch(VkCommandBuffer commandBuffer, - uint32_t groupCountX, - uint32_t groupCountY, - uint32_t groupCountZ) -{ - V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer); - - cmd_buffer_emit_pre_dispatch(cmd_buffer); - cmd_buffer_dispatch(cmd_buffer, 0, 0, 0, - groupCountX, groupCountY, groupCountZ); -} - VKAPI_ATTR void VKAPI_CALL v3dv_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t baseGroupX, @@ -4048,10 +4035,3 @@ v3dv_CmdDispatchIndirect(VkCommandBuffer commandBuffer, cmd_buffer_emit_pre_dispatch(cmd_buffer); cmd_buffer_dispatch_indirect(cmd_buffer, buffer, offset); } - -VKAPI_ATTR void VKAPI_CALL -v3dv_CmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMask) -{ - /* Nothing to do here since we only support a single device */ - assert(deviceMask == 0x1); -} diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index ce4a2948e97..bd81f022dee 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -1393,20 +1393,6 @@ v3dv_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, } } -VKAPI_ATTR void VKAPI_CALL -v3dv_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; -} - uint32_t v3dv_physical_device_vendor_id(struct v3dv_physical_device *dev) { diff --git a/src/broadcom/vulkan/v3dv_event.c b/src/broadcom/vulkan/v3dv_event.c index 849fd8429d3..b0298914d25 100644 --- a/src/broadcom/vulkan/v3dv_event.c +++ b/src/broadcom/vulkan/v3dv_event.c @@ -24,6 +24,8 @@ #include "v3dv_private.h" #include "compiler/nir/nir_builder.h" +#include "vk_common_entrypoints.h" + static nir_shader * get_set_event_cs() { @@ -510,7 +512,7 @@ cmd_buffer_emit_set_event(struct v3dv_cmd_buffer *cmd_buffer, VK_SHADER_STAGE_COMPUTE_BIT, 4, 1, &value); - v3dv_CmdDispatch(commandBuffer, 1, 1, 1); + vk_common_CmdDispatch(commandBuffer, 1, 1, 1); v3dv_cmd_buffer_meta_state_pop(cmd_buffer, 0, false); } @@ -540,7 +542,7 @@ cmd_buffer_emit_wait_event(struct v3dv_cmd_buffer *cmd_buffer, VK_SHADER_STAGE_COMPUTE_BIT, 0, 4, &offset); - v3dv_CmdDispatch(commandBuffer, 1, 1, 1); + vk_common_CmdDispatch(commandBuffer, 1, 1, 1); v3dv_cmd_buffer_meta_state_pop(cmd_buffer, 0, false); }