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

shaped-texture: Do not apply y-inverts to shape masks

Browse Source 
This was introduced by accident in commit 1467b6b02a

y-inverted textures in combination with shape masks appear to
be only commonly used with EGLstreams. However, as we draw the
shape mask ourselves, we don't want to apply the y-invert to it
as testified by the left over `cogl_pipeline_set_layer_matrix()`.

Note that we still allow to apply viemports and buffer transforms,
as the Xwayland mode setting emulation may use it (in fact only
the former, but it probably does not hurt to leave the later as well).

Closes https://gitlab.gnome.org/GNOME/mutter/-/issues/1792

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1937>
This commit is contained in:
Robert Mader 2021-07-20 13:02:38 +02:00 committed by Marge Bot
parent 111055acdd
commit 287c715df6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,15 +368,15 @@ get_base_pipeline (MetaShapedTexture *stex,
&GRAPHENE_POINT3D_INIT (0.5, 0.5, 0.0)); &GRAPHENE_POINT3D_INIT (0.5, 0.5, 0.0));
} }
cogl_pipeline_set_layer_matrix (pipeline, 1, &matrix);
if (!stex->is_y_inverted) if (!stex->is_y_inverted)
{ {
graphene_matrix_translate (&matrix, &GRAPHENE_POINT3D_INIT (0, -1, 0)); graphene_matrix_translate (&matrix, &GRAPHENE_POINT3D_INIT (0, -1, 0));
graphene_matrix_scale (&matrix, 1, -1, 1); graphene_matrix_scale (&matrix, 1, -1, 1);
cogl_pipeline_set_layer_matrix (pipeline, 0, &matrix);
} }
cogl_pipeline_set_layer_matrix (pipeline, 0, &matrix); cogl_pipeline_set_layer_matrix (pipeline, 0, &matrix);
cogl_pipeline_set_layer_matrix (pipeline, 1, &matrix);
if (stex->snippet) if (stex->snippet)
cogl_pipeline_add_layer_snippet (pipeline, 0, stex->snippet); cogl_pipeline_add_layer_snippet (pipeline, 0, stex->snippet);