From 11fbd9806dd99d7a18081ca0d09e4db977f8af1b Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 4 Sep 2020 14:06:29 -0500 Subject: [PATCH] compiler/types: Fix deserializing structs with >= 15 members This was a typo in a0b82c24b6d08c where we used the wrong struct member to decide whether or not to read the explicit_alignment. Fixes: a0b82c24b6d08c "nir/glsl: Add an explicit_alignment field to glsl_type" Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3487 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/compiler/glsl_types.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 288ddcf5dea..2a77b075c28 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -2858,7 +2858,7 @@ encode_type_to_blob(struct blob *blob, const glsl_type *type) /* If we don't have enough bits for length, store it separately. */ if (encoded.strct.length == 0xfffff) blob_write_uint32(blob, type->length); - if (encoded.strct.length == 0xf) + if (encoded.strct.explicit_alignment == 0xf) blob_write_uint32(blob, type->explicit_alignment); for (unsigned i = 0; i < type->length; i++) -- 2.30.2