diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2019-11-22 10:19:09 +0100 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-12-03 19:02:14 +0000 |
| commit | f11170fecb33da52ab1e9be6c1839f214025f55f (patch) | |
| tree | 67e474df388d23ec29623c3ad63c56a61bf893f1 /src/compositor/meta-shaped-texture.c | |
| parent | 48e6fccc956deab5d8dbb52eba52f8c2e2c64349 (diff) | |
| download | mutter-f11170fecb33da52ab1e9be6c1839f214025f55f.tar.gz | |
clutter/paint-node: Have caller of .._get_framebuffer() handle fallback
clutter_paint_node_get_framebuffer() fell back on
cogl_get_draw_framebuffer() when the root node didn't have a custom
get_framebuffer vfunc. As this relies on deprecated implicit Cogl stack
API, it needs to go away, so handle this in the caller that knows more
about the context.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/935
Diffstat (limited to 'src/compositor/meta-shaped-texture.c')
| -rw-r--r-- | src/compositor/meta-shaped-texture.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index ec02667ac..7a1a91df5 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -525,6 +525,7 @@ do_paint_content (MetaShapedTexture *stex, cairo_region_t *blended_tex_region; CoglContext *ctx; CoglPipelineFilter filter; + CoglFramebuffer *framebuffer; ensure_size_valid (stex); @@ -547,7 +548,10 @@ do_paint_content (MetaShapedTexture *stex, filter = COGL_PIPELINE_FILTER_LINEAR; - if (meta_actor_painting_untransformed (clutter_paint_node_get_framebuffer (root_node), + framebuffer = clutter_paint_node_get_framebuffer (root_node); + if (!framebuffer) + framebuffer = cogl_get_draw_framebuffer (); + if (meta_actor_painting_untransformed (framebuffer, dst_width, dst_height, NULL, NULL)) filter = COGL_PIPELINE_FILTER_NEAREST; |