From 1460f81eaeb4c07a2fdc34e295acce8566bb92d1 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 29 Aug 2025 14:50:56 +0200
Subject: [PATCH] [PR #844] glamor: don't use anonymous structs and unions in
 glamor_composite_shader

PR: https://github.com/X11Libre/xserver/pull/844
---
 glamor/glamor_priv.h   | 20 ++++++++++----------
 glamor/glamor_render.c | 26 ++++++++++++++------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index ccf7f31c90..ce3f242bff 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -93,20 +93,20 @@ typedef struct glamor_composite_shader {
     GLint source_repeat_mode;
     GLint mask_repeat_mode;
     union {
-        float source_solid_color[4];
+        float solid_color[4];
         struct {
-            PixmapPtr source_pixmap;
-            PicturePtr source;
-        };
-    };
+            PixmapPtr pixmap;
+            PicturePtr picture;
+        } pict;
+    } source;
 
     union {
-        float mask_solid_color[4];
+        float solid_color[4];
         struct {
-            PixmapPtr mask_pixmap;
-            PicturePtr mask;
-        };
-    };
+            PixmapPtr pixmap;
+            PicturePtr picture;
+        } pict;
+    } mask;
 } glamor_composite_shader;
 
 enum ca_state {
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 991d3eac32..8f42f117de 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1129,19 +1129,19 @@ glamor_composite_choose_shader(CARD8 op,
     }
 
     if (key.source == SHADER_SOURCE_SOLID)
-        memcpy(&(*shader)->source_solid_color[0],
+        memcpy(&(*shader)->source.solid_color[0],
                source_solid_color, 4 * sizeof(float));
     else {
-        (*shader)->source_pixmap = source_pixmap;
-        (*shader)->source = source;
+        (*shader)->source.pict.pixmap = source_pixmap;
+        (*shader)->source.pict.picture = source;
     }
 
     if (key.mask == SHADER_MASK_SOLID)
-        memcpy(&(*shader)->mask_solid_color[0],
+        memcpy(&(*shader)->mask.solid_color[0],
                mask_solid_color, 4 * sizeof(float));
     else {
-        (*shader)->mask_pixmap = mask_pixmap;
-        (*shader)->mask = mask;
+        (*shader)->mask.pict.pixmap = mask_pixmap;
+        (*shader)->mask.pict.picture = mask;
     }
 
     ret = TRUE;
@@ -1167,26 +1167,28 @@ glamor_composite_set_shader_blend(glamor_screen_private *glamor_priv,
     glUseProgram(shader->prog);
 
     if (key->source == SHADER_SOURCE_SOLID) {
-        glamor_set_composite_solid(shader->source_solid_color,
+        glamor_set_composite_solid(shader->source.solid_color,
                                    shader->source_uniform_location);
     }
     else {
         glamor_set_composite_texture(glamor_priv, 0,
-                                     shader->source,
-                                     shader->source_pixmap, shader->source_wh,
+                                     shader->source.pict.picture,
+                                     shader->source.pict.pixmap,
+                                     shader->source_wh,
                                      shader->source_repeat_mode,
                                      dest_priv);
     }
 
     if (key->mask != SHADER_MASK_NONE) {
         if (key->mask == SHADER_MASK_SOLID) {
-            glamor_set_composite_solid(shader->mask_solid_color,
+            glamor_set_composite_solid(shader->mask.solid_color,
                                        shader->mask_uniform_location);
         }
         else {
             glamor_set_composite_texture(glamor_priv, 1,
-                                         shader->mask,
-                                         shader->mask_pixmap, shader->mask_wh,
+                                         shader->mask.pict.picture,
+                                         shader->mask.pict.pixmap,
+                                         shader->mask_wh,
                                          shader->mask_repeat_mode,
                                          dest_priv);
         }