From de3a22ba1d8beefecbc82c9f7e98c0339291706b Mon Sep 17 00:00:00 2001 From: Vishnu Vardan Date: Sat, 25 Apr 2026 22:27:32 -0400 Subject: [PATCH] mesa/st: remove has_indirect_partial_stride from st_context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit has_indirect_partial_stride is a direct copy of screen->caps.multi_draw_indirect_partial_stride. Read the cap from the screen directly. Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_context.c | 2 -- src/mesa/state_tracker/st_context.h | 1 - src/mesa/state_tracker/st_draw.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 0cf143e4d15..5db93c5e930 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -583,8 +583,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe, PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_ALPHA_NOT_W); ctx->Const.GLSLHasHalfFloatPacking = screen->caps.shader_pack_half_float; - st->has_indirect_partial_stride = - screen->caps.multi_draw_indirect_partial_stride; st->has_occlusion_query = screen->caps.occlusion_query; st->has_single_pipe_stat = diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index c94328c6453..4a1760ec494 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -159,7 +159,6 @@ struct st_context bool force_compute_based_texture_transfer; bool force_specialized_compute_transfer; bool force_persample_in_shader; - bool has_indirect_partial_stride; bool has_occlusion_query; bool has_single_pipe_stat; bool has_pipeline_stat; diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index f630b0cdd2e..c3005f52c39 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -219,7 +219,7 @@ st_indirect_draw_vbo(struct gl_context *ctx, } else { indirect.draw_count = draw_count; indirect.stride = stride; - if (!st->has_indirect_partial_stride && stride && + if (!st->screen->caps.multi_draw_indirect_partial_stride && stride && (draw_count > 1 || indirect_draw_count)) { /* DrawElementsIndirectCommand or DrawArraysIndirectCommand */ const size_t struct_size = info.index_size ? sizeof(uint32_t) * 5 : sizeof(uint32_t) * 4;