asahi: mv initialization of grid z for indirect GS

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29179>
This commit is contained in:
Alyssa Rosenzweig 2024-05-09 10:37:41 -04:00 committed by Marge Bot
parent 4a344de276
commit 45e5b7ad50
2 changed files with 3 additions and 3 deletions

View file

@ -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);

View file

@ -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] =