isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-30 20:01:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

compositor: Make meta_actor_painting_untransformed take a framebuffer

Browse Source 
Stop using the cogl draw framebuffer implicitly.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/362
This commit is contained in:
Jonas Ådahl 2018-12-19 11:55:43 +01:00 committed by Ray Strode
parent e27c63e41b
commit 01d147a2d7
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compositor/clutter-utils.c
View File

@ -143,7 +143,8 @@ meta_actor_is_untransformed (ClutterActor *actor,
* transform. * transform.
*/ */
gboolean gboolean
meta_actor_painting_untransformed (int paint_width, meta_actor_painting_untransformed (CoglFramebuffer *fb,
int paint_width,
int paint_height, int paint_height,
int *x_origin, int *x_origin,
int *y_origin) int *y_origin)
@ -153,8 +154,8 @@ meta_actor_painting_untransformed (int paint_width,
float viewport[4]; float viewport[4];
int i; int i;
cogl_get_modelview_matrix (&modelview); cogl_framebuffer_get_modelview_matrix (fb, &modelview);
cogl_get_projection_matrix (&projection); cogl_framebuffer_get_projection_matrix (fb, &projection);
cogl_matrix_multiply (&modelview_projection, cogl_matrix_multiply (&modelview_projection,
&projection, &projection,
@ -173,7 +174,7 @@ meta_actor_painting_untransformed (int paint_width,
vertices[3].y = paint_height; vertices[3].y = paint_height;
vertices[3].z = 0; vertices[3].z = 0;
cogl_get_viewport (viewport); cogl_framebuffer_get_viewport4fv (fb, viewport);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {

9
src/compositor/clutter-utils.h
View File

@ -31,9 +31,10 @@ gboolean meta_actor_is_untransformed (ClutterActor *actor,
int *x_origin, int *x_origin,
int *y_origin); int *y_origin);
gboolean meta_actor_painting_untransformed (int paint_width, gboolean meta_actor_painting_untransformed (CoglFramebuffer *fb,
int paint_height, int paint_width,
int *x_origin, int paint_height,
int *y_origin); int *x_origin,
int *y_origin);
#endif /* __META_CLUTTER_UTILS_H__ */ #endif /* __META_CLUTTER_UTILS_H__ */

7
src/compositor/meta-background-actor.c
View File

@ -325,6 +325,7 @@ setup_pipeline (MetaBackgroundActor *self,
PipelineFlags pipeline_flags = 0; PipelineFlags pipeline_flags = 0;
guint8 opacity; guint8 opacity;
float color_component; float color_component;
CoglFramebuffer *fb;
CoglPipelineFilter filter; CoglPipelineFilter filter;
opacity = clutter_actor_get_paint_opacity (CLUTTER_ACTOR (self)); opacity = clutter_actor_get_paint_opacity (CLUTTER_ACTOR (self));
@ -417,8 +418,12 @@ setup_pipeline (MetaBackgroundActor *self,
color_component, color_component,
opacity / 255.); opacity / 255.);
fb = cogl_get_draw_framebuffer ();
if (!priv->force_bilinear && if (!priv->force_bilinear &&
meta_actor_painting_untransformed (actor_pixel_rect->width, actor_pixel_rect->height, NULL, NULL)) meta_actor_painting_untransformed (fb,
actor_pixel_rect->width,
actor_pixel_rect->height,
NULL, NULL))
filter = COGL_PIPELINE_FILTER_NEAREST; filter = COGL_PIPELINE_FILTER_NEAREST;
else else
filter = COGL_PIPELINE_FILTER_LINEAR; filter = COGL_PIPELINE_FILTER_LINEAR;

7
src/compositor/meta-shaped-texture.c
View File

@ -422,17 +422,20 @@ meta_shaped_texture_paint (ClutterActor *actor)
cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height }; cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };
fb = cogl_get_draw_framebuffer ();
/* Use nearest-pixel interpolation if the texture is unscaled. This /* Use nearest-pixel interpolation if the texture is unscaled. This
* improves performance, especially with software rendering. * improves performance, especially with software rendering.
*/ */
filter = COGL_PIPELINE_FILTER_LINEAR; filter = COGL_PIPELINE_FILTER_LINEAR;
if (meta_actor_painting_untransformed (tex_width, tex_height, NULL, NULL)) if (meta_actor_painting_untransformed (fb,
tex_width, tex_height,
NULL, NULL))
filter = COGL_PIPELINE_FILTER_NEAREST; filter = COGL_PIPELINE_FILTER_NEAREST;
ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ()); ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
fb = cogl_get_draw_framebuffer ();
opacity = clutter_actor_get_paint_opacity (actor); opacity = clutter_actor_get_paint_opacity (actor);
clutter_actor_get_allocation_box (actor, &alloc); clutter_actor_get_allocation_box (actor, &alloc);

6
src/compositor/meta-window-group.c
View File

@ -81,7 +81,11 @@ meta_window_group_paint (ClutterActor *actor)
*/ */
if (clutter_actor_is_in_clone_paint (actor)) if (clutter_actor_is_in_clone_paint (actor))
{ {
if (!meta_actor_painting_untransformed (screen_width, CoglFramebuffer *fb;
fb = cogl_get_draw_framebuffer ();
if (!meta_actor_painting_untransformed (fb,
screen_width,
screen_height, screen_height,
&paint_x_origin, &paint_x_origin,
&paint_y_origin) || &paint_y_origin) ||