From ec4b8b0d9e2cbe0c2fbdd1749fb8a3b2c3b498be Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Fri, 10 Nov 2017 09:50:10 +0000 Subject: [PATCH] Remove duplicated definitions in spirv_assembly tests Duplicated definitions are now allowed. Affects: dEQP-VK.spirv_assembly.instruction.compute.opphi.vartype_* dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.vector_related dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.vector_related_* Components: Vulkan VK-GL-CTS issue: 847 Change-Id: Ie09293ece03eeb25893aa66e7cb23e7ad8fa5e95 --- .../modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 5dd4726..b07a7be 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -2795,13 +2795,12 @@ void createOpPhiVartypeTests (de::MovePtr& group, tcu::TestC + string(getComputeAsmInputOutputBufferTraits()) + string(getComputeAsmCommonTypes()) + string(getComputeAsmInputOutputBuffer()) + "%id = OpVariable %uvec3ptr Input\n" - "%v3f32 = OpTypeVector %f32 3\n" "%zero = OpConstant %i32 0\n" "%float_0 = OpConstant %f32 0.0\n" "%float_1 = OpConstant %f32 1.0\n" "%float_n1 = OpConstant %f32 -1.0\n" - "%v1 = OpConstantComposite %v3f32 %float_1 %float_1 %float_1\n" - "%v2 = OpConstantComposite %v3f32 %float_n1 %float_n1 %float_n1\n" + "%v1 = OpConstantComposite %fvec3 %float_1 %float_1 %float_1\n" + "%v2 = OpConstantComposite %fvec3 %float_n1 %float_n1 %float_n1\n" "%main = OpFunction %void None %voidf\n" "%entry = OpLabel\n" @@ -2818,7 +2817,7 @@ void createOpPhiVartypeTests (de::MovePtr& group, tcu::TestC "%fb = OpLabel\n" " OpBranch %cm\n" "%cm = OpLabel\n" - "%vres = OpPhi %v3f32 %v1 %tb %v2 %fb\n" + "%vres = OpPhi %fvec3 %v1 %tb %v2 %fb\n" "%res = OpCompositeExtract %f32 %vres 2\n" "%outloc = OpAccessChain %f32ptr %outdata %zero %x\n" @@ -2933,7 +2932,6 @@ void createOpPhiVartypeTests (de::MovePtr& group, tcu::TestC + string(getComputeAsmInputOutputBufferTraits()) + string(getComputeAsmCommonTypes()) + string(getComputeAsmInputOutputBuffer()) + "%id = OpVariable %uvec3ptr Input\n" - "%v3f32 = OpTypeVector %f32 3\n" "%zero = OpConstant %i32 0\n" "%float_0 = OpConstant %f32 0.0\n" "%float_1 = OpConstant %f32 1.0\n" -- 2.7.4