From 45e5b7ad5021710d1cf4f880425a360cbb18fa9f Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 9 May 2024 10:37:41 -0400 Subject: [PATCH] asahi: mv initialization of grid z for indirect GS Signed-off-by: Alyssa Rosenzweig Part-of: --- src/asahi/lib/shaders/geometry.cl | 4 +--- src/gallium/drivers/asahi/agx_state.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/asahi/lib/shaders/geometry.cl b/src/asahi/lib/shaders/geometry.cl index e6f5198e52b..2c53c6d73fc 100644 --- a/src/asahi/lib/shaders/geometry.cl +++ b/src/asahi/lib/shaders/geometry.cl @@ -470,14 +470,12 @@ libagx_gs_setup_indirect(global struct agx_geometry_params *p, uint prim_per_instance = u_decomposed_prims_for_vertices(mode, vertex_count); p->input_primitives = prim_per_instance * instance_count; - /* Invoke VS as (vertices, instances, 1); GS as (primitives, instances, 1) */ + /* Invoke VS as (vertices, instances); GS as (primitives, instances) */ p->vs_grid[0] = vertex_count; p->vs_grid[1] = instance_count; - p->vs_grid[2] = 1; p->gs_grid[0] = prim_per_instance; p->gs_grid[1] = instance_count; - p->gs_grid[2] = 1; p->primitives_log2 = util_logbase2_ceil(prim_per_instance); diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index 3ee0d707a76..308bceb476b 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -3933,6 +3933,8 @@ agx_batch_geometry_params(struct agx_batch *batch, uint64_t input_index_buffer, params.count_buffer_stride = count_buffer_stride; batch->uniforms.vertex_output_buffer_ptr = agx_pool_alloc_aligned(&batch->pool, 8, 8).gpu; + + params.vs_grid[2] = params.gs_grid[2] = 1; } else { params.vs_grid[0] = draw->count; params.gs_grid[0] =