From 1280cf5b2afa757b86c21085d01229222e4180df Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Sun, 23 Jul 2023 12:33:15 +0200 Subject: [PATCH] draw: Do not restart the primitive_id at 0 Otherwise the primitive_id will wrap around to 0 if more than 4096 patches are drawn. cc: mesa-stable Reviewed-by: Roland Scheidegger Part-of: --- src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c | 2 +- src/gallium/auxiliary/draw/draw_tess.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c index 8fa6bc6bf8f..940fec5cf62 100644 --- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c +++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c @@ -773,7 +773,7 @@ llvm_middle_end_linear_run(struct draw_pt_middle_end *middle, fetch_info.elts = NULL; prim_info.linear = true; - prim_info.start = 0; + prim_info.start = start; prim_info.count = count; prim_info.elts = NULL; prim_info.prim = prim_type(fpme->input_prim, prim_flags); diff --git a/src/gallium/auxiliary/draw/draw_tess.c b/src/gallium/auxiliary/draw/draw_tess.c index fcf013b0aa9..3a0eb3c1efd 100644 --- a/src/gallium/auxiliary/draw/draw_tess.c +++ b/src/gallium/auxiliary/draw/draw_tess.c @@ -188,6 +188,7 @@ int draw_tess_ctrl_shader_run(struct draw_tess_ctrl_shader *shader, shader->draw->statistics.hs_invocations += num_patches; } #ifdef DRAW_LLVM_AVAILABLE + unsigned first_patch = input_prim->start / shader->draw->pt.vertices_per_patch; for (unsigned i = 0; i < num_patches; i++) { uint32_t vert_start = output_verts->count; @@ -195,7 +196,7 @@ int draw_tess_ctrl_shader_run(struct draw_tess_ctrl_shader *shader, llvm_fetch_tcs_input(shader, input_prim, i, shader->draw->pt.vertices_per_patch); - llvm_tcs_run(shader, i); + llvm_tcs_run(shader, first_patch + i); uint32_t old_verts = util_align_npot(vert_start, 16); uint32_t new_verts = util_align_npot(output_verts->count, 16);