From e03313c06ad4ea07bd7a4f6d8ceee827487748a0 Mon Sep 17 00:00:00 2001 From: Vishnu Vardan Date: Sun, 26 Apr 2026 00:27:14 -0400 Subject: [PATCH] mesa/st: remove prefer_real_buffer_in_constbuf0 from st_context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit prefer_real_buffer_in_constbuf0 is a direct copy of screen->caps.prefer_real_buffer_in_constbuf0. Read the cap from the screen directly. Reviewed-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_atom_constbuf.c | 2 +- src/mesa/state_tracker/st_context.c | 2 -- src/mesa/state_tracker/st_context.h | 1 - src/mesa/state_tracker/st_draw_feedback.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index 737372e0034..4759c344a00 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -121,7 +121,7 @@ st_upload_constants(struct st_context *st, struct gl_program *prog, mesa_shader_ cb.buffer_size = paramBytes; /* this path cannot be used with select/feedback draws */ - if (st->prefer_real_buffer_in_constbuf0) { + if (st->screen->caps.prefer_real_buffer_in_constbuf0) { struct pipe_context *pipe = st->pipe; struct pipe_resource *releasebuf = NULL; uint32_t *ptr; diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index a969a527d71..53ce3ef2114 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -593,8 +593,6 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe, break; default: break; } - st->prefer_real_buffer_in_constbuf0 = - screen->caps.prefer_real_buffer_in_constbuf0; st->has_conditional_render = screen->caps.conditional_render; st->lower_rect_tex = diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index c92080fa738..53eae1df676 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -162,7 +162,6 @@ struct st_context bool can_bind_const_buffer_as_vertex; bool lower_point_size; bool add_point_size; - bool prefer_real_buffer_in_constbuf0; bool has_conditional_render; bool lower_rect_tex; diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index 27bd452def0..0476f3368f2 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -181,7 +181,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, * in gl_program_parameter_list because allow_constbuf0_as_real_buffer * is set. */ - if ((st->prefer_real_buffer_in_constbuf0 || st->allow_st_finalize_nir_twice) && params->StateFlags) + if ((st->screen->caps.prefer_real_buffer_in_constbuf0 || st->allow_st_finalize_nir_twice) && params->StateFlags) _mesa_load_state_parameters(st->ctx, params); draw_set_constant_buffer_stride(draw, sizeof(float));