From: Karol Herbst <kherbst@redhat.com>
Date: Wed, 11 Dec 2019 15:01:15 +0000 (+0100)
Subject: nir/serialize: cast swizzle before shifting
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c83b1a4560284153e78bbd836556340356dc30fb;p=mesa.git

nir/serialize: cast swizzle before shifting

fixes undefined behaviour with enabled vec16

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/compiler/nir/nir_serialize.c b/src/compiler/nir/nir_serialize.c
index 49a353d4e10..b991b1d02e2 100644
--- a/src/compiler/nir/nir_serialize.c
+++ b/src/compiler/nir/nir_serialize.c
@@ -879,7 +879,7 @@ write_alu(write_ctx *ctx, const nir_alu_instr *alu)
                unsigned value = 0;
 
                for (unsigned j = 0; j < 8 && o + j < src_channels; j++) {
-                  value |= alu->src[i].swizzle[o + j] <<
+                  value |= (uint32_t)alu->src[i].swizzle[o + j] <<
                            (4 * j); /* 4 bits per swizzle */
                }