From bcba473eac5a1818eaaa318b8ee5e6ef75b61063 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Thu, 24 Nov 2022 10:55:20 -0500
Subject: [PATCH] asahi: Fix UB in union with logic ops

Colour mask written.

Fixes: 9dddbfeaef2 ("asahi: Fix logic ops")
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19998>
---
 src/gallium/drivers/asahi/agx_state.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/asahi/agx_state.h b/src/gallium/drivers/asahi/agx_state.h
index 3543282..ec88db4 100644
--- a/src/gallium/drivers/asahi/agx_state.h
+++ b/src/gallium/drivers/asahi/agx_state.h
@@ -136,11 +136,8 @@ struct agx_zsa {
 
 struct agx_blend {
    bool logicop_enable, blend_enable;
-
-   union {
-      nir_lower_blend_rt rt[8];
-      unsigned logicop_func;
-   };
+   nir_lower_blend_rt rt[8];
+   unsigned logicop_func;
 };
 
 struct asahi_shader_key {
-- 
2.7.4