Mesa (main): pan/gen_pack: Add parens around packed1/2 vars in pan_merge()

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Aug 26 08:52:46 UTC 2021


Module: Mesa
Branch: main
Commit: 0400c4ca1b77a291f53bf9d7085bd602ea6672c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0400c4ca1b77a291f53bf9d7085bd602ea6672c9

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Wed Aug  4 12:23:02 2021 +0200

pan/gen_pack: Add parens around packed1/2 vars in pan_merge()

This way we can pass *desc instead of (*desc).

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12551>

---

 src/panfrost/lib/gen_pack.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panfrost/lib/gen_pack.py b/src/panfrost/lib/gen_pack.py
index c9b1edddd2d..6f97a1b55ad 100644
--- a/src/panfrost/lib/gen_pack.py
+++ b/src/panfrost/lib/gen_pack.py
@@ -179,7 +179,7 @@ __gen_unpack_padded(const uint8_t *restrict cl, uint32_t start, uint32_t end)
 #define pan_merge(packed1, packed2, type) \
         do { \
                 for (unsigned i = 0; i < (PREFIX2(type, LENGTH) / 4); ++i) \
-                        packed1.opaque[i] |= packed2.opaque[i]; \
+                        (packed1).opaque[i] |= (packed2).opaque[i]; \
         } while(0)
 
 #define mali_pixel_format_print_v6(fp, format) \\



More information about the mesa-commit mailing list