Draw tests: added missing flags in create info structures.

diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp
index 6547b96..52ea403 100644 (file)
--- a/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp
+++ b/external/vulkancts/modules/vulkan/draw/vktDrawCreateInfoUtil.cpp
@@ -56,9 +56,9 @@ ImageSubresourceRange::ImageSubresourceRange (vk::VkImageAspectFlags  _aspectMask
 }
 
 ComponentMapping::ComponentMapping (vk::VkComponentSwizzle _r,
-                                                                   vk::VkComponentSwizzle _g,
-                                                                   vk::VkComponentSwizzle _b,
-                                                                   vk::VkComponentSwizzle _a)
+                                                                       vk::VkComponentSwizzle _g,
+                                                                       vk::VkComponentSwizzle _b,
+                                                                       vk::VkComponentSwizzle _a)
 {
        r = _r;
        g = _g;
@@ -135,6 +135,7 @@ BufferViewCreateInfo::BufferViewCreateInfo (vk::VkBuffer    _buffer,
        sType = vk::VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO;
        pNext = DE_NULL;
 
+       flags   = 0;
        buffer  = _buffer;
        format  = _format;
        offset  = _offset;
@@ -653,6 +654,7 @@ PipelineLayoutCreateInfo::PipelineLayoutCreateInfo (deUint32                                                        _descriptorSe
 
        sType = vk::VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
        pNext = DE_NULL;
+       flags                                   = 0;
        setLayoutCount                  = static_cast<deUint32>(m_setLayouts.size());
        pSetLayouts                             = setLayoutCount > 0 ? &m_setLayouts[0] : DE_NULL;
        pushConstantRangeCount  = static_cast<deUint32>(m_pushConstantRanges.size());
@@ -675,7 +677,8 @@ PipelineLayoutCreateInfo::PipelineLayoutCreateInfo (const std::vector<vk::VkDesc
        sType = vk::VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
        pNext = DE_NULL;
 
-       setLayoutCount = static_cast<deUint32>(m_setLayouts.size());
+       flags                   = 0;
+       setLayoutCount  = static_cast<deUint32>(m_setLayouts.size());
 
        if (setLayoutCount)
        {
@@ -735,7 +738,8 @@ PipelineCreateInfo::TessellationState::TessellationState (deUint32 _patchControl
 {
        sType = vk::VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO;
        pNext = DE_NULL;
-       patchControlPoints = _patchControlPoints;
+       flags                           = 0;
+       patchControlPoints      = _patchControlPoints;
 }
 
 PipelineCreateInfo::ViewportState::ViewportState (deUint32                                             _viewportCount,
@@ -776,6 +780,7 @@ PipelineCreateInfo::ViewportState::ViewportState (const ViewportState& other)
 {
        sType                   = other.sType;
        pNext                   = other.pNext;
+       flags                   = other.flags;
        viewportCount   = other.viewportCount;
        scissorCount    = other.scissorCount;
 
@@ -790,6 +795,7 @@ PipelineCreateInfo::ViewportState& PipelineCreateInfo::ViewportState::operator=
 {
        sType                   = other.sType;
        pNext                   = other.pNext;
+       flags                   = other.flags;
        viewportCount   = other.viewportCount;
        scissorCount    = other.scissorCount;
 
@@ -851,6 +857,7 @@ PipelineCreateInfo::MultiSampleState::MultiSampleState (const MultiSampleState&
 {
        sType                                   = other.sType;
        pNext                                   = other.pNext;
+       flags                                   = other.flags;
        rasterizationSamples    = other.rasterizationSamples;
        sampleShadingEnable             = other.sampleShadingEnable;
        minSampleShading                = other.minSampleShading;
@@ -865,6 +872,7 @@ PipelineCreateInfo::MultiSampleState& PipelineCreateInfo::MultiSampleState::oper
 {
        sType = other.sType;
        pNext = other.pNext;
+       flags                                   = other.flags;
        rasterizationSamples    = other.rasterizationSamples;
        sampleShadingEnable             = other.sampleShadingEnable;
        minSampleShading                = other.minSampleShading;
@@ -899,6 +907,7 @@ PipelineCreateInfo::ColorBlendState::ColorBlendState (deUint32                                                                                      _attach
 {
        sType = vk::VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;
        pNext   = DE_NULL;
+       flags                                   = 0;
        logicOpEnable                   = _logicOpEnable;
        logicOp                                 = _logicOp;
        attachmentCount                 = static_cast<deUint32>(m_attachments.size());
@@ -910,6 +919,7 @@ PipelineCreateInfo::ColorBlendState::ColorBlendState (const vk::VkPipelineColorB
 {
        sType = createInfo.sType;
        pNext = createInfo.pNext;
+       flags                                   = createInfo.flags;
        logicOpEnable                   = createInfo.logicOpEnable;
        logicOp                                 = createInfo.logicOp;
        attachmentCount                 = static_cast<deUint32>(m_attachments.size());
@@ -921,6 +931,7 @@ PipelineCreateInfo::ColorBlendState::ColorBlendState (const ColorBlendState& cre
 {
        sType = createInfo.sType;
        pNext = createInfo.pNext;
+       flags                                   = createInfo.flags;
        logicOpEnable                   = createInfo.logicOpEnable;
        logicOp                                 = createInfo.logicOp;
        attachmentCount                 = static_cast<deUint32>(m_attachments.size());
@@ -992,8 +1003,9 @@ PipelineCreateInfo::DepthStencilState::DepthStencilState (vk::VkBool32             _depthTe
 
 PipelineCreateInfo::DynamicState::DynamicState (const std::vector<vk::VkDynamicState>& _dynamicStates)
 {
-       sType = vk::VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
-       pNext = DE_NULL;
+       sType   = vk::VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
+       pNext   = DE_NULL;
+       flags   = 0;
 
        if (!_dynamicStates.size())
        {
@@ -1014,10 +1026,10 @@ PipelineCreateInfo::DynamicState::DynamicState (const DynamicState &other)
        sType = other.sType;
        pNext = other.pNext;
 
-       dynamicStateCount = other.dynamicStateCount;
-
-       m_dynamicStates = std::vector<vk::VkDynamicState>(other.pDynamicStates, other.pDynamicStates + dynamicStateCount);
-       pDynamicStates = &m_dynamicStates[0];
+       flags                           = other.flags;
+       dynamicStateCount       = other.dynamicStateCount;
+       m_dynamicStates         = std::vector<vk::VkDynamicState>(other.pDynamicStates, other.pDynamicStates + dynamicStateCount);
+       pDynamicStates          = &m_dynamicStates[0];
 }
 
 PipelineCreateInfo::DynamicState& PipelineCreateInfo::DynamicState::operator= (const DynamicState& other)
@@ -1025,10 +1037,10 @@ PipelineCreateInfo::DynamicState& PipelineCreateInfo::DynamicState::operator= (c
        sType = other.sType;
        pNext = other.pNext;
 
-       dynamicStateCount = other.dynamicStateCount;
-
-       m_dynamicStates = std::vector<vk::VkDynamicState>(other.pDynamicStates, other.pDynamicStates + dynamicStateCount);
-       pDynamicStates = &m_dynamicStates[0];
+       flags                           = other.flags;
+       dynamicStateCount       = other.dynamicStateCount;
+       m_dynamicStates         = std::vector<vk::VkDynamicState>(other.pDynamicStates, other.pDynamicStates + dynamicStateCount);
+       pDynamicStates          = &m_dynamicStates[0];
 
        return *this;
 }