fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-18 07:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

kk: Fix geometry unroll for list primitives.

Browse source 
List primitives would be handled by geometry unroll as if restart is always
enabled, telling the unroll shader to restart the primitive at the usual
restart index. This would produce invalid geometry for list primitives where
restart is disabled and the restart index is used as a valid index.

Instead, always force the restart index for unrolling to UINT32_MAX when
restart is disabled, and refactor the index promotion logic accordingly.

Reviewed-by: Aitor Camacho <aitor@lunarg.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41333>
This commit is contained in:
squidbus 2026-04-23 19:20:04 -07:00 • committed by Marge Bot
parent 2182160370
commit ef6a6f28a8
2 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/kosmickrisp/vulkan/kk_cmd_draw.c
View file

@ -903,8 +903,7 @@ kk_heap(struct kk_cmd_buffer *cmd)
/* Unrolling will always be done through indirect rendering, so if this is
* called from non-indirect calls, we will fake it. */
static struct kk_draw_data
kk_unroll_geometry(struct kk_cmd_buffer *cmd, struct kk_draw_data data,
bool promote_index_type)
kk_unroll_geometry(struct kk_cmd_buffer *cmd, struct kk_draw_data data)
{
struct kk_device *dev = kk_cmd_buffer_device(cmd);
if (!data.indirect) {
@ -946,8 +945,9 @@ kk_unroll_geometry(struct kk_cmd_buffer *cmd, struct kk_draw_data data,
.in_draw = mtl_buffer_get_gpu_address(data.indirect_buffer) +
data.indirect_buffer_offset,
.out_draw = out_draw->gpu,
/* Handle primitive restart disable by forcing index to UINT32_MAX */
.restart_index =
promote_index_type ? UINT32_MAX : cmd->state.gfx.index.restart,
!data.restart ? UINT32_MAX : cmd->state.gfx.index.restart,
.index_buffer_size_el = data.index_buffer_range_B,
.in_el_size_B = data.index_size,
.out_el_size_B = 4u,
@ -1030,16 +1030,19 @@ kk_dispatch_draw(struct kk_cmd_buffer *cmd, struct kk_draw_data data)
}
static bool
requires_index_promotion(struct kk_cmd_buffer *cmd)
requires_index_promotion(struct kk_draw_data data)
{
const struct vk_dynamic_graphics_state *dyn =
&cmd->vk.dynamic_graphics_state;
switch (dyn->ia.primitive_topology) {
case VK_PRIMITIVE_TOPOLOGY_LINE_STRIP:
case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP:
case VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN:
return (!dyn->ia.primitive_restart_enable &&
cmd->state.gfx.index.bytes_per_index < sizeof(uint32_t));
/* For primitive types that support primitive restart, if restart is disabled
* and the index size is less than uint32_t, we need to make sure to perform
* unrolling as it automatically promotes the type to uint32_t, preventing
* valid indices from being treated as restarts. For uint32_t indices with
* restart disabled, we realistically will never have enough vertices for the
* restart index to be valid anyway. */
switch (data.prim) {
case MESA_PRIM_LINE_STRIP:
case MESA_PRIM_TRIANGLE_STRIP:
case MESA_PRIM_TRIANGLE_FAN:
return (!data.restart && data.index_size < sizeof(uint32_t));
default:
return false;
}
@ -1053,17 +1056,10 @@ kk_draw(struct kk_cmd_buffer *cmd, struct kk_draw_data data)
return;
kk_flush_gfx_state(cmd);
data.restart = cmd->vk.dynamic_graphics_state.ia.primitive_restart_enable;
/* If the restart bool is set, it means that primitive restart is disabled
* but index type is not uint32_t which requires promoting the type to
* uint32_t since we cannot disable primitive restart in Metal. */
bool promote_index_type = requires_index_promotion(cmd);
/* We always need to unroll triangle fans. */
data.restart = (data.prim == MESA_PRIM_TRIANGLE_FAN);
if (promote_index_type || data.restart)
data = kk_unroll_geometry(cmd, data, promote_index_type);
if (data.prim == MESA_PRIM_TRIANGLE_FAN || requires_index_promotion(data))
data = kk_unroll_geometry(cmd, data);
kk_dispatch_draw(cmd, data);
}

2
src/kosmickrisp/vulkan/kk_encoder.c
View file

@ -66,6 +66,8 @@ kk_encoder_start_render(struct kk_cmd_buffer *cmd,
* like triangle fans. For this, we signal the value pre_gfx will wait on,
* and we wait on the value pre_gfx will signal once completed.
*/
mtl_encode_signal_event(encoder->main.cmd_buffer, encoder->event,
++encoder->event_value);
encoder->wait_value_pre_gfx = encoder->event_value;
mtl_encode_wait_for_event(encoder->main.cmd_buffer, encoder->event,
++encoder->event_value);