From 89d14463932d3134c340c947aeb7a5f83f334b45 Mon Sep 17 00:00:00 2001 From: Andrew Woloszyn Date: Mon, 30 Nov 2015 10:47:46 -0500 Subject: [PATCH] Changed array initializers to fix android build. --- .../spirv_assembly/vktSpvAsmInstructionTests.cpp | 30 +++++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 5c25e3f..8db9d80 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -1705,17 +1705,33 @@ struct InstanceContext map testCodeFragments; InstanceContext (const RGBA (&inputs)[4], const RGBA (&outputs)[4], const map& testCodeFragments_) - : inputColors (inputs) - , outputColors (outputs) - , testCodeFragments (testCodeFragments_) - {} + : testCodeFragments (testCodeFragments_) + { + inputColors[0] = inputs[0]; + inputColors[1] = inputs[1]; + inputColors[2] = inputs[2]; + inputColors[3] = inputs[3]; + + outputColors[0] = outputs[0]; + outputColors[1] = outputs[1]; + outputColors[2] = outputs[2]; + outputColors[3] = outputs[3]; + } InstanceContext (const InstanceContext& other) : moduleMap (other.moduleMap) - , inputColors (other.inputColors) - , outputColors (other.outputColors) , testCodeFragments (other.testCodeFragments) - {} + { + inputColors[0] = other.inputColors[0]; + inputColors[1] = other.inputColors[1]; + inputColors[2] = other.inputColors[2]; + inputColors[3] = other.inputColors[3]; + + outputColors[0] = other.outputColors[0]; + outputColors[1] = other.outputColors[1]; + outputColors[2] = other.outputColors[2]; + outputColors[3] = other.outputColors[3]; + } }; // A description of a shader to be used for a single stage of the graphics pipeline. -- 2.7.4