fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panvk: Implement CmdDraw[Indexed]IndirectCount for v10+

Browse source 
Signed-off-by: Ryan Mckeever <ryan.mckeever@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34571>
This commit is contained in:
Ryan Mckeever 2025-04-16 23:25:48 -07:00 • committed by Marge Bot
parent de896234d8
commit cebd908bf3
2 changed files with 69 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
View file

@ -2251,18 +2251,30 @@ panvk_cmd_draw_indirect(struct panvk_cmd_buffer *cmdbuf,
struct cs_index attrib_offset = cs_scratch_reg32(b, 4);
struct cs_index multiplicand = cs_scratch_reg32(b, 5);
struct cs_index draw_count = cs_scratch_reg32(b, 6);
struct cs_index max_draw_count = cs_scratch_reg32(b, 7);
struct cs_index draw_id = cs_scratch_reg32(b, 7);
struct cs_index vs_fau_addr = cs_scratch_reg64(b, 8);
struct cs_index tracing_scratch_regs = cs_scratch_reg_tuple(b, 10, 4);
uint32_t vs_fau_count = BITSET_COUNT(vs->fau.used_sysvals) +
BITSET_COUNT(vs->fau.used_push_consts);
if (draw->indirect.count_buffer_dev_addr) {
cs_move32_to(b, max_draw_count, draw->indirect.draw_count);
cs_move64_to(b, draw_params_addr, draw->indirect.count_buffer_dev_addr);
cs_load32_to(b, draw_count, draw_params_addr, 0);
/* wait for draw_count to load from buffer */
cs_wait_slot(b, SB_ID(LS), false);
cs_umin32(b, draw_count, draw_count, max_draw_count);
} else {
cs_move32_to(b, draw_count, draw->indirect.draw_count);
}
if (patch_faus)
cs_move64_to(b, vs_fau_addr, cmdbuf->state.gfx.vs.push_uniforms);
cs_move64_to(b, draw_params_addr, draw->indirect.buffer_dev_addr);
cs_move32_to(b, draw_id, 0);
cs_move32_to(b, draw_count, draw->indirect.draw_count);
cs_req_res(b, CS_IDVS_RES);
@ -2434,6 +2446,61 @@ panvk_per_arch(CmdDrawIndexedIndirect)(VkCommandBuffer commandBuffer,
panvk_cmd_draw_indirect(cmdbuf, &draw);
}
VKAPI_ATTR void VKAPI_CALL
panvk_per_arch(CmdDrawIndirectCount)(VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
VkBuffer countBuffer,
VkDeviceSize countBufferOffset,
uint32_t maxDrawCount,
uint32_t stride)
{
VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
VK_FROM_HANDLE(panvk_buffer, buffer, _buffer);
VK_FROM_HANDLE(panvk_buffer, count_buffer, countBuffer);
if (maxDrawCount == 0)
return;
struct panvk_draw_info draw = {
.indirect.buffer_dev_addr = panvk_buffer_gpu_ptr(buffer, offset),
.indirect.count_buffer_dev_addr =
panvk_buffer_gpu_ptr(count_buffer, countBufferOffset),
.indirect.draw_count = maxDrawCount,
.indirect.stride = stride,
};
panvk_cmd_draw_indirect(cmdbuf, &draw);
}
VKAPI_ATTR void VKAPI_CALL
panvk_per_arch(CmdDrawIndexedIndirectCount)(VkCommandBuffer commandBuffer,
VkBuffer _buffer,
VkDeviceSize offset,
VkBuffer countBuffer,
VkDeviceSize countBufferOffset,
uint32_t maxDrawCount,
uint32_t stride)
{
VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
VK_FROM_HANDLE(panvk_buffer, buffer, _buffer);
VK_FROM_HANDLE(panvk_buffer, count_buffer, countBuffer);
if (maxDrawCount == 0)
return;
struct panvk_draw_info draw = {
.index.size = cmdbuf->state.gfx.ib.index_size,
.indirect.buffer_dev_addr = panvk_buffer_gpu_ptr(buffer, offset),
.indirect.count_buffer_dev_addr =
panvk_buffer_gpu_ptr(count_buffer, countBufferOffset),
.indirect.draw_count = maxDrawCount,
.indirect.stride = stride,
};
panvk_cmd_draw_indirect(cmdbuf, &draw);
}
void
panvk_per_arch(cmd_inherit_render_state)(
struct panvk_cmd_buffer *cmdbuf,

1
src/panfrost/vulkan/panvk_cmd_draw.h
View file

@ -352,6 +352,7 @@ struct panvk_draw_info {
struct {
uint64_t buffer_dev_addr;
uint64_t count_buffer_dev_addr;
uint32_t draw_count;
uint32_t stride;
} indirect;