diff --git a/.pick_status.json b/.pick_status.json index e8838595de7..ba9a2edf7b5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -174,7 +174,7 @@ "description": "vtn: Allow for OpCopyLogical with different but compatible types", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 2587c866723..5f36118c704 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -4375,9 +4375,13 @@ vtn_handle_composite(struct vtn_builder *b, SpvOp opcode, w + 5, count - 5); break; - case SpvOpCopyLogical: + case SpvOpCopyLogical: { ssa = vtn_composite_copy(b, vtn_ssa_value(b, w[3])); + struct vtn_type *dst_type = vtn_get_value_type(b, w[2]); + vtn_assert(vtn_types_compatible(b, type, dst_type)); + ssa->type = glsl_get_bare_type(dst_type->type); break; + } case SpvOpCopyObject: vtn_copy_value(b, w[3], w[2]); return;