Revert "spirv: Implement OpCopyObject and OpCopyLogical as blind copies"

This reverts commit 7a53e67816ed9baf7d825ed60ee59f0c05f9df48.

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index a60b1cba1bd8b5e0d8b415faccc74ed5d31d00db..61abc7272783926fc14aaa30af530a419a9d7946 100644 (file)
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -3553,30 +3553,10 @@ vtn_handle_composite(struct vtn_builder *b, SpvOp opcode,
                                  w + 5, count - 5);
       break;
 
+   case SpvOpCopyLogical:
    case SpvOpCopyObject:
-   case SpvOpCopyLogical: {
-      struct vtn_value *src = vtn_untyped_value(b, w[3]);
-      struct vtn_value *dst = vtn_push_value(b, w[2], src->value_type);
-      if (opcode == SpvOpCopyObject) {
-         vtn_fail_if(dst->type->id != src->type->id,
-                     "Result Type of OpCopyObject must equal Operand type");
-      } else {
-         assert(opcode == SpvOpCopyLogical);
-         /* The logical type matching rules should guarantee we have exactly
-          * the same GLSL type which means that, if it's an SSA value, we
-          * don't actually need to clone it; we can just copy it blind.
-          */
-         vtn_fail_if(dst->type->type != src->type->type,
-                     "Result Type of OpCopyLogical must logically match "
-                     "the Operand type");
-      }
-      struct vtn_value src_copy = *src;
-      src_copy.name = dst->name;
-      src_copy.decoration = dst->decoration;
-      src_copy.type = dst->type;
-      *dst = src_copy;
-      return;
-   }
+      ssa = vtn_composite_copy(b, vtn_ssa_value(b, w[3]));
+      break;
 
    default:
       vtn_fail_with_opcode("unknown composite operation", opcode);