mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2025-12-20 04:40:07 +01:00
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 <derek.foreman@collabora.com>
This commit is contained in:
parent
727d976e3c
commit
37a427e4e0
1 changed files with 4 additions and 4 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue