From 415857775f040ace2e05ac7314e05a214e3684dc Mon Sep 17 00:00:00 2001 From: Mais Alnasser Date: Sat, 30 Jan 2016 19:25:30 -0500 Subject: [PATCH] Apply formating fixes Remove ArrayStride code. --- .../vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 6b45683..52f8f1c 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -605,7 +605,6 @@ tcu::TestCaseGroup* createOpCopyMemoryGroup (tcu::TestContext& testCtx) "OpName %id \"gl_GlobalInvocationID\"\n" "OpDecorate %id BuiltIn GlobalInvocationId\n" - "OpDecorate %vec4arr ArrayStride 16\n" + string(s_InputOutputBufferTraits) + string(s_CommonTypes) + @@ -665,7 +664,6 @@ tcu::TestCaseGroup* createOpCopyMemoryGroup (tcu::TestContext& testCtx) "OpName %id \"gl_GlobalInvocationID\"\n" "OpDecorate %id BuiltIn GlobalInvocationId\n" - "OpDecorate %f32arr100 ArrayStride 4\n" + string(s_InputOutputBufferTraits) + string(s_CommonTypes) + @@ -3392,7 +3390,7 @@ void createPipelineShaderStages (const DeviceInterface& vk, const VkDevice vkDev "%f32 = OpTypeFloat 32\n" \ "%v3f32 = OpTypeVector %f32 3\n" \ "%v4f32 = OpTypeVector %f32 4\n" \ - "%v4bool = OpTypeVector %bool 4\n" \ + "%v4bool = OpTypeVector %bool 4\n" \ \ "%v4f32_function = OpTypeFunction %v4f32 %v4f32\n" \ "%fun = OpTypeFunction %void\n" \ @@ -6568,7 +6566,7 @@ tcu::TestCaseGroup* createNoContractionTests(tcu::TestContext& testCtx) "%is0 = OpFOrdEqual %bool %add %c_f32_0\n" "%isn1n24 = OpFOrdEqual %bool %add %c_f32_n1pn24\n" "%success = OpLogicalOr %bool %is0 %isn1n24\n" - "%v4success = OpCompositeConstruct %v4bool %success %success %success %success\n" + "%v4success = OpCompositeConstruct %v4bool %success %success %success %success\n" "%ret = OpSelect %v4f32 %v4success %c_vec4_0 %c_vec4_1\n" " OpReturnValue %ret\n" " OpFunctionEnd\n"; @@ -6954,7 +6952,7 @@ void createOpQuantizeSingleOptionTests(tcu::TestCaseGroup* testCtx) "%b = OpFAdd %f32 %test_constant %a\n" "%c = OpQuantizeToF16 %f32 %b\n" "${condition}\n" - "%v4cond = OpCompositeConstruct %v4bool %cond %cond %cond %cond\n" + "%v4cond = OpCompositeConstruct %v4bool %cond %cond %cond %cond\n" "%retval = OpSelect %v4f32 %v4cond %c_v4f32_1_0_0_1 %param1\n" " OpReturnValue %retval\n" "OpFunctionEnd\n" @@ -6970,7 +6968,7 @@ void createOpQuantizeSingleOptionTests(tcu::TestCaseGroup* testCtx) "%param1 = OpFunctionParameter %v4f32\n" "%label_testfun = OpLabel\n" "${condition}\n" - "%v4cond = OpCompositeConstruct %v4bool %cond %cond %cond %cond\n" + "%v4cond = OpCompositeConstruct %v4bool %cond %cond %cond %cond\n" "%retval = OpSelect %v4f32 %v4cond %c_v4f32_1_0_0_1 %param1\n" " OpReturnValue %retval\n" "OpFunctionEnd\n" @@ -7085,7 +7083,7 @@ void createOpQuantizeTwoPossibilityTests(tcu::TestCaseGroup* testCtx) "%eq_1 = OpFOrdEqual %bool %c %possible_solution1\n" "%eq_2 = OpFOrdEqual %bool %c %possible_solution2\n" "%cond = OpLogicalOr %bool %eq_1 %eq_2\n" - "%v4cond = OpCompositeConstruct %v4bool %cond %cond %cond %cond\n" + "%v4cond = OpCompositeConstruct %v4bool %cond %cond %cond %cond\n" "%retval = OpSelect %v4f32 %v4cond %c_v4f32_1_0_0_1 %param1" " OpReturnValue %retval\n" "OpFunctionEnd\n"; -- 2.7.4