Fix build for older GCCs

GCC 4.9 doesn't understand aggregate initialization
syntax introduced in 3 files:

- vktBindingDescriptorUpdateTests.cpp
- vktPipelineMultisampleShaderBuiltInTests.cpp
- vktPipelineSamplerTests.cpp

Align test case constructors with the rest of
the code base by avoiding the feature.

Affects:

dEQP-VK.binding_model.descriptor_update.*
dEQP-VK.pipeline.multisample_shader_builtin.*
dEQP-VK.pipeline.sampler.*

Components: Vulkan

VK-GL-CTS issue: 2265

Change-Id: I908baf308d62586e7d9baf8d389b2ce599e8912e

diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateTests.cpp
index 5cbd427fc33cdd6f49787d38fc8e5251798b6f6b..e74eda33dae688f56445fb8d56af0a3812779d6e 100644 (file)
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorUpdateTests.cpp
@@ -197,7 +197,7 @@ const tcu::Vec4                     SamplerlessDescriptorWriteTestInstance::kDescriptorColor        {0.0f
 
 SamplerlessDescriptorWriteTestCase::SamplerlessDescriptorWriteTestCase (tcu::TestContext& testCtx, const std::string& name, const std::string& description, const SamplerlessParams& params)
        : vkt::TestCase{testCtx, name, description}
-       , m_params{params}
+       , m_params(params)
 {
 }
 
@@ -292,7 +292,7 @@ vkt::TestInstance* SamplerlessDescriptorWriteTestCase::createInstance (Context&
 
 SamplerlessDescriptorWriteTestInstance::SamplerlessDescriptorWriteTestInstance (Context& context, const SamplerlessParams& params)
        : vkt::TestInstance{context}
-       , m_params{params}
+       , m_params(params)
 {
 }
 

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderBuiltInTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderBuiltInTests.cpp
index fb29c9e00729cb0c569e9742bf97a48c891f7617..d788cf53363da03b46075d64643927689d63677a 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderBuiltInTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleShaderBuiltInTests.cpp
@@ -1087,7 +1087,7 @@ class WriteSampleTest : public vkt::TestCase
 {
 public:
                                                                        WriteSampleTest         (tcu::TestContext& testCtx, const std::string& name, const std::string& desc, const WriteSampleParams& params)
-                                                                               : vkt::TestCase(testCtx, name, desc), m_params{params}
+                                                                               : vkt::TestCase(testCtx, name, desc), m_params(params)
                                                                                {}
        virtual                                                 ~WriteSampleTest        (void) {}
 
@@ -1126,7 +1126,7 @@ class WriteSampleTestInstance : public vkt::TestInstance
 {
 public:
                                                                WriteSampleTestInstance         (vkt::Context& context, const WriteSampleParams& params)
-                                                                       : vkt::TestInstance(context), m_params{params}
+                                                                       : vkt::TestInstance(context), m_params(params)
                                                                        {}
 
        virtual                                         ~WriteSampleTestInstance        (void) {}

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp
index d515d41dba6ca310f702928fd2eae653de6d0728..72cd39d3d12ac662bb713ba5f764caaa5be17cdd 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerTests.cpp
@@ -1165,7 +1165,7 @@ std::vector<vk::VkVertexInputAttributeDescription> ExactSamplingCase::VertexData
 
 
 ExactSamplingCase::ExactSamplingCase (tcu::TestContext& testCtx, const std::string& name, const std::string& description, const Params& params)
-       : vkt::TestCase{testCtx, name, description}, m_params{params}
+       : vkt::TestCase{testCtx, name, description}, m_params(params)
 {
 }
 
@@ -1254,7 +1254,7 @@ void ExactSamplingCase::checkSupport (Context& context) const
 }
 
 ExactSamplingInstance::ExactSamplingInstance (Context& context, const Params& params)
-       : vkt::TestInstance{context}, m_params{params}
+       : vkt::TestInstance{context}, m_params(params)
 {
 }