From 1b470ee09fdcecdd0c62d7907ed18eed4ddbb196 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Mon, 17 Aug 2020 12:02:22 +0300 Subject: [PATCH] spirv: Only require bare types to match when copying variables OpCopyMemory doesn't care about mismatched decorations, only about matching types. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3418 Fixes: bf1a1eed882980a1cd08482386e3a001ce64a5a4 Signed-off-by: Danylo Piliaiev Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit b6ebf6eba958651321a8e332677877c0fe7ee7ec) --- .pick_status.json | 2 +- src/compiler/spirv/vtn_variables.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 11128ec8597..a9158c3fb39 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -985,7 +985,7 @@ "description": "spirv: Only require bare types to match when copying variables", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "bf1a1eed882980a1cd08482386e3a001ce64a5a4" }, diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 00743d6552c..93c4e004ab1 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1182,7 +1182,8 @@ static void _vtn_variable_copy(struct vtn_builder *b, struct vtn_pointer *dest, struct vtn_pointer *src) { - vtn_assert(src->type->type == dest->type->type); + vtn_assert(glsl_get_bare_type(src->type->type) == + glsl_get_bare_type(dest->type->type)); enum glsl_base_type base_type = glsl_get_base_type(src->type->type); switch (base_type) { case GLSL_TYPE_UINT: