From 37a427e4e02b894a24d6d371adb74f1159958ba7 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 21 Oct 2025 13:41:07 -0500 Subject: [PATCH] gl-renderer: Set up solids in config_init Instead of overriding solid draws later on, just set them up in the init function. Signed-off-by: Derek Foreman --- libweston/renderer-gl/gl-renderer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c index d9a691418..4a88eedcc 100644 --- a/libweston/renderer-gl/gl-renderer.c +++ b/libweston/renderer-gl/gl-renderer.c @@ -1518,7 +1518,10 @@ gl_shader_config_init_for_paint_node(struct gl_shader_config *sconf, if (!pnode->surf_xform_valid) return false; - return prepare_textured_draw(sconf, pnode); + if (pnode->draw_solid) + return prepare_solid_draw(sconf, pnode); + else + return prepare_textured_draw(sconf, pnode); } static int @@ -2124,9 +2127,6 @@ draw_paint_node(struct weston_paint_node *pnode, pixman_region32_subtract(&surface_blend, &surface_blend, &surface_opaque); - if (pnode->draw_solid) - prepare_solid_draw(&sconf, pnode); - if (pixman_region32_not_empty(&surface_opaque)) { transform_damage(pnode, &repaint, &quads, &nquads); repaint_region(gr, pnode, quads, nquads, &surface_opaque,