brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shaped-texture: Reset pipelines when texture format changes

Browse Source 
Changing the MultiTexture may require a different set of pipelines when
the texture format is different. We keep track of the attached
MultiTextureFormat just like we do for the width and height.

This fixes misrendering when a client attaches buffers with different
MultiTextureFormats to the same surface.

Fixes: 3dd9f15eb ("shaped-texture: Start using MetaMultiTexture")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3456>
This commit is contained in:
Sebastian Wick 2023-12-14 15:35:14 +01:00
parent 85f173d0d7
commit 7458907360
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,7 @@ struct _MetaShapedTexture
int viewport_dst_width; int viewport_dst_width;
int viewport_dst_height; int viewport_dst_height;
MetaMultiTextureFormat tex_format;
int tex_width, tex_height; int tex_width, tex_height;
int fallback_width, fallback_height; int fallback_width, fallback_height;
int dst_width, dst_height; int dst_width, dst_height;
@ -577,6 +578,7 @@ static void
set_multi_texture (MetaShapedTexture *stex, set_multi_texture (MetaShapedTexture *stex,
MetaMultiTexture *multi_tex) MetaMultiTexture *multi_tex)
{ {
MetaMultiTextureFormat format;
int width, height; int width, height;
g_clear_object (&stex->texture); g_clear_object (&stex->texture);
@ -584,18 +586,22 @@ set_multi_texture (MetaShapedTexture *stex,
if (multi_tex != NULL) if (multi_tex != NULL)
{ {
stex->texture = g_object_ref (multi_tex); stex->texture = g_object_ref (multi_tex);
format = meta_multi_texture_get_format (multi_tex);
width = meta_multi_texture_get_width (multi_tex); width = meta_multi_texture_get_width (multi_tex);
height = meta_multi_texture_get_height (multi_tex); height = meta_multi_texture_get_height (multi_tex);
} }
else else
{ {
format = META_MULTI_TEXTURE_FORMAT_INVALID;
width = 0; width = 0;
height = 0; height = 0;
} }
if (stex->tex_width != width || if (stex->tex_width != width ||
stex->tex_height != height) stex->tex_height != height ||
stex->tex_format != format)
{ {
stex->tex_format = format;
stex->tex_width = width; stex->tex_width = width;
stex->tex_height = height; stex->tex_height = height;
meta_shaped_texture_reset_pipelines (stex); meta_shaped_texture_reset_pipelines (stex);