AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3dv: Delete VK_KHR_device_group provided entrypoints

Browse Source 
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 <rebecca.mckeever@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20218>
This commit is contained in:
Rebecca Mckeever
2022-12-09 14:07:17 -06:00
parent 64d7385e61
commit 6b1e2e9eb6
3 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/vulkan/v3dv_cmd_buffer.c
-20
View File
@@ -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);
}
src/broadcom/vulkan/v3dv_device.c
-14
View File
@@ -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)
{
src/broadcom/vulkan/v3dv_event.c
+4 -2
View File
@@ -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);
}