From f5b5929a1a4de337543edeeb023512cbbf7c5c00 Mon Sep 17 00:00:00 2001 From: Vishnu Vardan Date: Sun, 26 Apr 2026 00:32:21 -0400 Subject: [PATCH] mesa/st: remove has_conditional_render from st_context MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit has_conditional_render is a direct copy of screen->caps.conditional_render. Read the cap from the screen directly. Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/blit.c | 2 +- src/mesa/state_tracker/st_context.c | 2 -- src/mesa/state_tracker/st_context.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/main/blit.c b/src/mesa/main/blit.c index 37f9d862773..018c11880d1 100644 --- a/src/mesa/main/blit.c +++ b/src/mesa/main/blit.c @@ -505,7 +505,7 @@ do_blit_framebuffer(struct gl_context *ctx, st_window_rectangles_to_blit(ctx, &blit); blit.filter = pFilter; - blit.render_condition_enable = st->has_conditional_render; + blit.render_condition_enable = st->screen->caps.conditional_render; blit.alpha_blend = false; if (mask & GL_COLOR_BUFFER_BIT) { diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 53ce3ef2114..80d8d6d8799 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->has_conditional_render = - screen->caps.conditional_render; st->lower_rect_tex = !screen->caps.texrect; st->allow_st_finalize_nir_twice = diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 53eae1df676..9f576737ec8 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 has_conditional_render; bool lower_rect_tex; /* There are consequences for drivers wanting to call st_finalize_nir