From 64d7385e61e7f2da5159ec4fbc3f7047503f01ae Mon Sep 17 00:00:00 2001 From: Rebecca Mckeever Date: Fri, 9 Dec 2022 14:07:00 -0600 Subject: [PATCH] radv: Delete VK_KHR_device_group provided entrypoints Delete radv_CmdDispatch, radv_CmdSetDeviceMask, and radv_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: Samuel Pitoiset Part-of: --- src/amd/vulkan/layers/radv_sqtt_layer.c | 2 +- src/amd/vulkan/radv_acceleration_structure.c | 7 +++++-- src/amd/vulkan/radv_cmd_buffer.c | 12 ------------ src/amd/vulkan/radv_device.c | 12 ------------ src/amd/vulkan/radv_device_generated_commands.c | 4 +++- src/amd/vulkan/radv_meta_clear.c | 3 ++- 6 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index 1553ae3..fac2c10 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/src/amd/vulkan/layers/radv_sqtt_layer.c @@ -484,7 +484,7 @@ sqtt_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VKAPI_ATTR void VKAPI_CALL sqtt_CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { - EVENT_MARKER(Dispatch, commandBuffer, x, y, z); + EVENT_MARKER_ALIAS(DispatchBase, Dispatch, commandBuffer, 0, 0, 0, x, y, z); } VKAPI_ATTR void VKAPI_CALL diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c index 7104364..9fbf8b0 100644 --- a/src/amd/vulkan/radv_acceleration_structure.c +++ b/src/amd/vulkan/radv_acceleration_structure.c @@ -31,6 +31,8 @@ #include "bvh/build_interface.h" +#include "vk_common_entrypoints.h" + static const uint32_t leaf_spv[] = { #include "bvh/leaf.comp.spv.h" }; @@ -774,7 +776,8 @@ ploc_build_internal(VkCommandBuffer commandBuffer, uint32_t infoCount, radv_CmdPushConstants(commandBuffer, cmd_buffer->device->meta_state.accel_struct_build.ploc_p_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(consts), &consts); - radv_CmdDispatch(commandBuffer, MAX2(DIV_ROUND_UP(bvh_states[i].node_count, 64), 1), 1, 1); + vk_common_CmdDispatch(commandBuffer, + MAX2(DIV_ROUND_UP(bvh_states[i].node_count, 64), 1), 1, 1); } } @@ -1067,7 +1070,7 @@ radv_CmdCopyMemoryToAccelerationStructureKHR( cmd_buffer->device->meta_state.accel_struct_build.copy_p_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(consts), &consts); - radv_CmdDispatch(commandBuffer, 512, 1, 1); + vk_common_CmdDispatch(commandBuffer, 512, 1, 1); radv_meta_restore(&saved_state, cmd_buffer); } diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index c8757bb..97f386b 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -9655,12 +9655,6 @@ radv_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t base_x, uint32_t ba } VKAPI_ATTR void VKAPI_CALL -radv_CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) -{ - radv_CmdDispatchBase(commandBuffer, 0, 0, 0, x, y, z); -} - -VKAPI_ATTR void VKAPI_CALL radv_CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -10485,12 +10479,6 @@ radv_CmdWaitEvents2(VkCommandBuffer commandBuffer, uint32_t eventCount, const Vk radv_barrier(cmd_buffer, pDependencyInfos, RGP_BARRIER_EXTERNAL_CMD_WAIT_EVENTS); } -VKAPI_ATTR void VKAPI_CALL -radv_CmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMask) -{ - /* No-op */ -} - /* VK_EXT_conditional_rendering */ VKAPI_ATTR void VKAPI_CALL radv_CmdBeginConditionalRenderingEXT( diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index caa7a31..ac94bec 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -7541,18 +7541,6 @@ radv_GetMemoryFdPropertiesKHR(VkDevice _device, VkExternalMemoryHandleTypeFlagBi } } -VKAPI_ATTR void VKAPI_CALL -radv_GetDeviceGroupPeerMemoryFeatures(VkDevice device, uint32_t heapIndex, - uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, - VkPeerMemoryFeatureFlags *pPeerMemoryFeatures) -{ - assert(localDeviceIndex == remoteDeviceIndex); - - *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; -} - static const VkTimeDomainEXT radv_time_domains[] = { VK_TIME_DOMAIN_DEVICE_EXT, VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT, diff --git a/src/amd/vulkan/radv_device_generated_commands.c b/src/amd/vulkan/radv_device_generated_commands.c index 0e2cb0a..63561a0 100644 --- a/src/amd/vulkan/radv_device_generated_commands.c +++ b/src/amd/vulkan/radv_device_generated_commands.c @@ -26,6 +26,8 @@ #include "nir_builder.h" +#include "vk_common_entrypoints.h" + static void radv_get_sequence_size(const struct radv_indirect_command_layout *layout, const struct radv_graphics_pipeline *pipeline, uint32_t *cmd_size, @@ -1342,7 +1344,7 @@ radv_prepare_dgc(struct radv_cmd_buffer *cmd_buffer, ds_writes); unsigned block_count = MAX2(1, round_up_u32(pGeneratedCommandsInfo->sequencesCount, 64)); - radv_CmdDispatch(radv_cmd_buffer_to_handle(cmd_buffer), block_count, 1, 1); + vk_common_CmdDispatch(radv_cmd_buffer_to_handle(cmd_buffer), block_count, 1, 1); radv_buffer_finish(&token_buffer); radv_meta_restore(&saved_state, cmd_buffer); diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 13d4db1..9a90ca8 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -28,6 +28,7 @@ #include "util/format_rgb9e5.h" #include "vk_format.h" +#include "vk_common_entrypoints.h" enum { DEPTH_CLEAR_SLOW, DEPTH_CLEAR_FAST }; @@ -679,7 +680,7 @@ clear_htile_mask(struct radv_cmd_buffer *cmd_buffer, const struct radv_image *im radv_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), state->clear_htile_mask_p_layout, VK_SHADER_STAGE_COMPUTE_BIT, 0, 8, constants); - radv_CmdDispatch(radv_cmd_buffer_to_handle(cmd_buffer), block_count, 1, 1); + vk_common_CmdDispatch(radv_cmd_buffer_to_handle(cmd_buffer), block_count, 1, 1); radv_buffer_finish(&dst_buffer); -- 2.7.4