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

panvk: Make indexed draw use indirect indexed draw

Browse Source 
Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Olivia Lee <olivia.lee@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35724>
This commit is contained in:
Mary Guillemard
2025-07-01 18:56:19 +02:00
committed by Marge Bot
parent e25064c026
commit d936bb496c
2 changed files with 18 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/libpan/draw_helper.cl
-63
View File
@@ -436,69 +436,6 @@ padded_vertex_count(uint32_t vertex_count, uint32_t instance_count, bool idvs)
/* Argument ordering choosen to avoid any padding */
KERNEL(1)
panlib_draw_indexed_helper(
global uint8_t *index_buffer_ptr, uint32_t index_size, uint32_t first_index,
uint32_t index_count, uint32_t first_instance, uint32_t instance_count,
int32_t vertex_offset, uint32_t primitive_vertex_count,
uint32_t attrib_bufs_valid, uint32_t attribs_valid,
uint8_t primitive_restart,
global struct mali_attribute_buffer_packed *varying_bufs_descs,
global struct libpan_draw_helper_varying_buf_info *varying_bufs_info,
global struct mali_attribute_buffer_packed *attrib_bufs_descs,
global struct libpan_draw_helper_attrib_buf_info *attrib_bufs_infos,
global struct mali_attribute_packed *attribs_descs,
global struct libpan_draw_helper_attrib_info *attribs_infos,
global uint32_t *first_vertex_sysval, global uint32_t *first_instance_sysval,
global uint32_t *raw_vertex_offset_sysval, global uint8_t *idvs_job,
global uint8_t *vertex_job, global uint8_t *tiler_job)
{
/* First compute the min and max range */
uint32_t min_vertex, max_vertex;
panlib_index_minmax_search(index_buffer_ptr, index_size * 8, first_index,
index_count, primitive_restart, &min_vertex,
&max_vertex);
const uint32_t vertex_range = max_vertex - min_vertex + 1;
struct panlib_draw_info draw = {
.idvs_job = idvs_job,
.vertex_job = vertex_job,
.tiler_job = tiler_job,
.index.size = index_size,
.index.offset = first_index,
.vertex.base = vertex_offset,
.vertex.raw_offset = min_vertex + vertex_offset,
.vertex.count = index_count,
.instance.base = first_instance,
.instance.count = instance_count,
.varying_bufs.descs = varying_bufs_descs,
.varying_bufs.info = varying_bufs_info,
.attrib_bufs.descs = attrib_bufs_descs,
.attrib_bufs.infos = attrib_bufs_infos,
.attrib_bufs.valid = attrib_bufs_valid,
.attribs.descs = attribs_descs,
.attribs.infos = attribs_infos,
.attribs.valid = attribs_valid,
.vertex_range = vertex_range,
.padded_vertex_count =
padded_vertex_count(vertex_range, instance_count, idvs_job != NULL),
.primitive_vertex_count = primitive_vertex_count,
.indices = index_buffer_ptr,
};
panlib_patch_draw(&draw);
*first_vertex_sysval = draw.vertex.base;
*first_instance_sysval = draw.instance.base;
*raw_vertex_offset_sysval = draw.vertex.raw_offset;
}
KERNEL(1)
panlib_draw_indirect_helper(
global VkDrawIndirectCommand *cmd,
src/panfrost/vulkan/jm/panvk_vX_cmd_draw.c
+18 -33
View File
@@ -1723,34 +1723,7 @@ panvk_cmd_draw_indirect(struct panvk_cmd_buffer *cmdbuf,
panlib_draw_indirect_helper_struct(&precomp_ctx, indirect_grid,
indirect_barrier, args);
} else {
const struct panlib_draw_indexed_helper_args args = {
.index_buffer_ptr = cmdbuf->state.gfx.ib.dev_addr,
.index_size = draw->info.index.size,
.first_index = draw->info.index.offset,
.index_count = draw->info.vertex.count,
.first_instance = draw->info.instance.base,
.instance_count = draw->info.instance.count,
.vertex_offset = draw->info.vertex.base,
.primitive_restart = ia->primitive_restart_enable,
.varying_bufs_descs = draw->varying_bufs,
.varying_bufs_info = draw->indirect_info.varying_bufs,
.attrib_bufs_descs = draw->vs.attribute_bufs,
.attrib_bufs_infos = draw->indirect_info.attrib_bufs,
.attrib_bufs_valid = attrib_bufs_valid,
.attribs_valid = attribs_valid,
.attribs_descs = draw->vs.attributes,
.attribs_infos = draw->indirect_info.attribs,
.first_vertex_sysval = first_vertex_sysval,
.first_instance_sysval = first_instance_sysval,
.raw_vertex_offset_sysval = raw_vertex_offset_sysval,
.idvs_job = vs->info.vs.idvs ? draw->jobs.idvs.gpu : 0,
.vertex_job = draw->jobs.vertex.gpu,
.tiler_job = draw->jobs.tiler.gpu,
.primitive_vertex_count = primitive_vertex_count(
translate_prim_topology(ia->primitive_topology)),
};
panlib_draw_indexed_helper_struct(&precomp_ctx, indirect_grid,
indirect_barrier, args);
assert(false && "Invalid indirect draw");
}
/* Grab the index of the indirect helper job */
@@ -1869,14 +1842,26 @@ panvk_per_arch(CmdDrawIndexed)(VkCommandBuffer commandBuffer,
* firstInstnace. */
assert(firstInstance < INT32_MAX);
struct pan_ptr indirect_index_alloc = panvk_cmd_alloc_dev_mem(
cmdbuf, desc, sizeof(struct VkDrawIndexedIndirectCommand), 8);
struct VkDrawIndexedIndirectCommand *indirect_index_alloc_ptr =
indirect_index_alloc.cpu;
*indirect_index_alloc_ptr = (struct VkDrawIndexedIndirectCommand){
.indexCount = indexCount,
.instanceCount = instanceCount,
.firstIndex = firstIndex,
.vertexOffset = vertexOffset,
.firstInstance = firstInstance,
};
struct panvk_draw_data draw = {
.info = {
.index.size = cmdbuf->state.gfx.ib.index_size,
.index.offset = firstIndex,
.vertex.base = vertexOffset,
.vertex.count = indexCount,
.instance.base = firstInstance,
.instance.count = instanceCount,
.indirect.buffer_dev_addr = indirect_index_alloc.gpu,
.indirect.draw_count = 1,
.indirect.stride = 0,
},
};