From 7458907360c05a57334244a3cc2a534c48056f1b Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Thu, 14 Dec 2023 15:35:14 +0100
Subject: [PATCH] shaped-texture: Reset pipelines when texture format changes

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>
---
 src/compositor/meta-shaped-texture.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index d511a728d..345c20c1e 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -101,6 +101,7 @@ struct _MetaShapedTexture
   int viewport_dst_width;
   int viewport_dst_height;
 
+  MetaMultiTextureFormat tex_format;
   int tex_width, tex_height;
   int fallback_width, fallback_height;
   int dst_width, dst_height;
@@ -577,6 +578,7 @@ static void
 set_multi_texture (MetaShapedTexture *stex,
                    MetaMultiTexture  *multi_tex)
 {
+  MetaMultiTextureFormat format;
   int width, height;
 
   g_clear_object (&stex->texture);
@@ -584,18 +586,22 @@ set_multi_texture (MetaShapedTexture *stex,
   if (multi_tex != NULL)
     {
       stex->texture = g_object_ref (multi_tex);
+      format = meta_multi_texture_get_format (multi_tex);
       width = meta_multi_texture_get_width (multi_tex);
       height = meta_multi_texture_get_height (multi_tex);
     }
   else
     {
+      format = META_MULTI_TEXTURE_FORMAT_INVALID;
       width = 0;
       height = 0;
     }
 
   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_height = height;
       meta_shaped_texture_reset_pipelines (stex);