From ba09a00a5cbbcd75b59ec121985ff4d12f220eb8 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 3 Jun 2022 16:32:39 -0400 Subject: [PATCH] format_utils: properly parenthesize macro params this otherwise breaks evaluation of the parameters on arm64 cc: mesa-stable fixes #6496 Reviewed-by: Rob Clark Reviewed-by: Ian Romanick Part-of: --- src/util/format/format_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/format/format_utils.h b/src/util/format/format_utils.h index 0768a26ecce..c53d5e0f80f 100644 --- a/src/util/format/format_utils.h +++ b/src/util/format/format_utils.h @@ -37,7 +37,7 @@ /* Extends an integer of size SRC_BITS to one of size DST_BITS linearly */ #define EXTEND_NORMALIZED_INT(X, SRC_BITS, DST_BITS) \ (((X) * (int)(u_uintN_max(DST_BITS) / u_uintN_max(SRC_BITS))) + \ - ((DST_BITS % SRC_BITS) ? ((X) >> (SRC_BITS - DST_BITS % SRC_BITS)) : 0)) + (((DST_BITS) % (SRC_BITS)) ? ((X) >> ((SRC_BITS) - (DST_BITS) % (SRC_BITS))) : 0)) static inline float _mesa_unorm_to_float(unsigned x, unsigned src_bits)