Fix same_struct_two_ids amber test

Due to 1.4 has removed some features and the test mentioned below
requires SPIR-V 1.4 the test fails with InternalError reporting:

    2nd operand of Decorate: operand BufferBlock(3) requires SPIR-V
    version 1.3 or earlier.

Replace BufferBlock with Block and use StorageBuffer instead of Uniform.

Updates:
 * dEQP-VK.spirv_assembly.instruction.spirv1p4.opcopylogical.same_struct_two_ids

Components: Framework

VK-GL-CTS issue: 1817

Change-Id: Ia80923fc6f717729712017904773c015c17168ec
(cherry picked from commit facb3d6815f678c7d25d25919fca7e33cea931df)

diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber
index 788ab9a..c5b7ea8 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber
+++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/opcopylogical/same_struct_two_ids.amber
@@ -13,7 +13,7 @@ OpMemberDecorate %struct1 0 Offset 0
 OpMemberDecorate %struct1 1 Offset 4
 OpMemberDecorate %struct1 2 Offset 8
 OpMemberDecorate %struct1 3 Offset 12
-OpDecorate %struct2 BufferBlock
+OpDecorate %struct2 Block
 OpMemberDecorate %struct2 0 Offset 0
 OpMemberDecorate %struct2 1 Offset 4
 OpMemberDecorate %struct2 2 Offset 8
@@ -29,10 +29,10 @@ OpDecorate %out_var Binding 1
 %ptr_struct1 = OpTypePointer Uniform %struct1
 
 %struct2 = OpTypeStruct %int %int %int %int
-%ptr_struct2 = OpTypePointer Uniform %struct2
+%ptr_struct2 = OpTypePointer StorageBuffer %struct2
 
 %in_var = OpVariable %ptr_struct1 Uniform
-%out_var = OpVariable %ptr_struct2 Uniform
+%out_var = OpVariable %ptr_struct2 StorageBuffer
 
 %func_ty = OpTypeFunction %void
 %main = OpFunction %void None %func_ty