Remove instances of pDynamicState->dynamicStateCount = 0

Specification explicitly disallows using
VkPipelineDynamicStateCreateInfo with dynamicStateCount = 0 when
creating pipelines. Instead pDynamicState must be set to NULL.

Change-Id: Iff9e2f10e0080ffae0f6698aff342132f148b41d

diff --git a/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
index b2df06e..cbc26d3 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiBufferViewAccessTests.cpp
@@ -565,15 +565,6 @@ BufferViewTestInstance::BufferViewTestInstance (Context& context, BufferViewCase
                        { 0.0f, 0.0f, 0.0f, 0.0f },                                                                     // float                                                                                blendConst[4];
                };
 
-               const VkPipelineDynamicStateCreateInfo  dynamicStateParams              =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                      sType;
-                       DE_NULL,                                                                                                        // const void*                          pNext;
-                       (VkPipelineDynamicStateCreateFlags)0,
-                       0u,                                                                                                                     // deUint32                                     dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*        pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -589,7 +580,7 @@ BufferViewTestInstance::BufferViewTestInstance (Context& context, BufferViewCase
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        DE_NULL,                                                                                        // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       DE_NULL,                                                                                        // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index b807333..6d3f159 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@ -1511,14 +1511,6 @@ struct GraphicsPipeline
                        colorBlendAttState,
                        { 0.0f, 0.0f, 0.0f, 0.0f }                              // blendConstants
                };
-               const VkPipelineDynamicStateCreateInfo                  dynamicState            =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,
-                       DE_NULL,
-                       (VkPipelineDynamicStateCreateFlags)0,
-                       0u,                                                                             // dynamicStateCount
-                       DE_NULL,                                                                // pDynamicStates
-               };
                const VkGraphicsPipelineCreateInfo                              pipelineInfo            =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
@@ -1534,7 +1526,7 @@ struct GraphicsPipeline
                        &multisampleState,
                        &depthStencilState,
                        &colorBlendState,
-                       &dynamicState,
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,
                        *res.layout.object,
                        *res.renderPass.object,
                        0u,                                                                             // subpass

diff --git a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp
index 24cca5b..d48b7d6 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp
@@ -521,14 +521,6 @@ tcu::TestStatus renderTriangleTest (Context& context)
                &attBlendParams,                                                                                        // pAttachments
                { 0.0f, 0.0f, 0.0f, 0.0f },                                                                     // blendConstants[4]
        };
-       const VkPipelineDynamicStateCreateInfo  dynamicStateInfo                =
-       {
-               VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,   // sType
-               DE_NULL,                                                                                                // pNext
-               0u,                                                                                                             // flags
-               0u,                                                                                                             // dynamicStateCount
-               DE_NULL                                                                                                 // pDynamicStates
-       };
        const VkGraphicsPipelineCreateInfo              pipelineParams                  =
        {
                VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,                // sType
@@ -544,7 +536,7 @@ tcu::TestStatus renderTriangleTest (Context& context)
                &multisampleParams,                                                                             // pMultisampleState
                &depthStencilParams,                                                                    // pDepthStencilState
                &blendParams,                                                                                   // pColorBlendState
-               &dynamicStateInfo,                                                                              // pDynamicState
+               (const VkPipelineDynamicStateCreateInfo*)DE_NULL,               // pDynamicState
                *pipelineLayout,                                                                                // layout
                *renderPass,                                                                                    // renderPass
                0u,                                                                                                             // subpass

diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
index 600436d..894773c 100644 (file)
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
@@ -947,14 +947,6 @@ vk::Move<vk::VkPipeline> SingleCmdRenderInstance::createPipeline (vk::VkPipeline
                &cbAttachment,                                                          // pAttachments
                { 0.0f, 0.0f, 0.0f, 0.0f },                                     // blendConst
        };
-       const vk::VkPipelineDynamicStateCreateInfo                      dynState                        =
-       {
-               vk::VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,
-               DE_NULL,
-               (vk::VkPipelineDynamicStateCreateFlags)0,
-               0u,                                                                                     // dynamicStateCount
-               DE_NULL,                                                                        // pDynamicStates
-       };
        const vk::VkGraphicsPipelineCreateInfo createInfo =
        {
                vk::VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
@@ -970,7 +962,7 @@ vk::Move<vk::VkPipeline> SingleCmdRenderInstance::createPipeline (vk::VkPipeline
                &msState,                                                                                                               // pMultisampleState
                &dsState,                                                                                                               // pDepthStencilState
                &cbState,                                                                                                               // pColorBlendState
-               &dynState,                                                                                                              // pDynamicState
+               (const vk::VkPipelineDynamicStateCreateInfo*)DE_NULL,                   // pDynamicState
                pipelineLayout,                                                                                                 // layout
                *m_renderPass,                                                                                                  // renderPass
                0u,                                                                                                                             // subpass

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp
index e306cb9..b92e355 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineBlendTests.cpp
@@ -616,15 +616,6 @@ BlendTestInstance::BlendTestInstance (Context&                                                                     context,
                        }
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateParams =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -640,7 +631,7 @@ BlendTestInstance::BlendTestInstance (Context&                                                                      context,
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp
index c9af88e..b4f9c3b 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineCacheTests.cpp
@@ -367,15 +367,6 @@ Move<VkPipeline> SimpleGraphicsPipelineBuilder::buildPipeline (tcu::UVec2 render
                VK_FALSE,                                                   // VkBool32                                 alphaToOneEnable;
        };
 
-       const VkPipelineDynamicStateCreateInfo  dynamicStateParams      =
-       {
-               VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,       // VkStructureType                      sType;
-               DE_NULL,                                                    // const void*                          pNext;
-               0u,                                                         // VkPipelineDynamicStateCreateFlags    flags;
-               0u,                                                         // deUint32                             dynamicStateCount;
-               DE_NULL,                                                    // const VkDynamicState*                pDynamicStates;
-       };
-
        VkPipelineDepthStencilStateCreateInfo depthStencilStateParams =
        {
                VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, // VkStructureType                          sType;
@@ -439,7 +430,7 @@ Move<VkPipeline> SimpleGraphicsPipelineBuilder::buildPipeline (tcu::UVec2 render
                &multisampleStateParams,                            // const VkPipelineMultisampleStateCreateInfo*      pMultisampleState;
                &depthStencilStateParams,                           // const VkPipelineDepthStencilStateCreateInfo*     pDepthStencilState;
                &colorBlendStateParams,                             // const VkPipelineColorBlendStateCreateInfo*       pColorBlendState;
-               &dynamicStateParams,                                // const VkPipelineDynamicStateCreateInfo*          pDynamicState;
+               (const VkPipelineDynamicStateCreateInfo*)DE_NULL,   // const VkPipelineDynamicStateCreateInfo*          pDynamicState;
                *m_pipelineLayout,                                  // VkPipelineLayout                                 layout;
                renderPass,                                         // VkRenderPass                                     renderPass;
                0u,                                                 // deUint32                                         subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp
index 9981264..4c50283 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp
@@ -594,16 +594,6 @@ DepthTestInstance::DepthTestInstance (Context&                             context,
                        false,                                                                                                          // VkBool32                                                                     alphaToCoverageEnable;
                        false                                                                                                           // VkBool32                                                                     alphaToOneEnable;
                };
-
-               const VkPipelineDynamicStateCreateInfo dynamicStateParams               =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                VkPipelineDepthStencilStateCreateInfo depthStencilStateParams =
                {
                        VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,     // VkStructureType                                                      sType;
@@ -653,7 +643,7 @@ DepthTestInstance::DepthTestInstance (Context&                              context,
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
index 0667e22..53637cc 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
@@ -788,15 +788,6 @@ ImageSamplingInstance::ImageSamplingInstance (Context&                                                     context,
                        +1.0f                                                                                                           // float                        maxDepthBounds;
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateParams =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -812,7 +803,7 @@ ImageSamplingInstance::ImageSamplingInstance (Context&                                                      context,
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp
index d37cd1f..8afbb5e 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineInputAssemblyTests.cpp
@@ -1257,15 +1257,6 @@ InputAssemblyInstance::InputAssemblyInstance (Context&                                                   context,
                        +1.0f                                                                                                           // float                        maxDepthBounds;
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateParams =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -1281,7 +1272,7 @@ InputAssemblyInstance::InputAssemblyInstance (Context&                                                    context,
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
index 912f482..b744a4e 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
@@ -1614,15 +1614,6 @@ MultisampleRenderer::MultisampleRenderer (Context&                                                                               context,
                        { 0.0f, 0.0f, 0.0f, 0.0f }                                                                      // float                                                                                blendConstants[4];
                };
 
-               const VkPipelineDynamicStateCreateInfo  dynamicStateParams              =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                const VkPipelineDepthStencilStateCreateInfo depthStencilStateParams =
                {
                        VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,     // VkStructureType                                                      sType;
@@ -1672,7 +1663,7 @@ MultisampleRenderer::MultisampleRenderer (Context&                                                                                context,
                        &m_multisampleStateParams,                                                      // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
index 618dc43..5b670b7 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
@@ -844,15 +844,6 @@ PushConstantGraphicsTestInstance::PushConstantGraphicsTestInstance (Context&
                        false                                                                                                           // VkBool32                                                                     alphaToOneEnable;
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateParams               =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                VkPipelineDepthStencilStateCreateInfo depthStencilStateParams =
                {
                        VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,     // VkStructureType                                                      sType;
@@ -910,7 +901,7 @@ PushConstantGraphicsTestInstance::PushConstantGraphicsTestInstance (Context&
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
index fa57224..ef405e8 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
@@ -693,15 +693,6 @@ StencilTestInstance::StencilTestInstance (Context&                                 context,
                        +1.0f                                                                                                           // float                                                                        maxDepthBounds;
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateParams =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -717,7 +708,7 @@ StencilTestInstance::StencilTestInstance (Context&                                  context,
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 6dca81a..53a6c27
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
@@ -513,15 +513,6 @@ Move<VkPipeline> SimpleGraphicsPipelineBuilder::buildPipeline(tcu::UVec2 renderS
                VK_FALSE,                                                   // VkBool32                                 alphaToOneEnable;
        };
 
-       const VkPipelineDynamicStateCreateInfo  dynamicStateParams      =
-       {
-               VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,       // VkStructureType                      sType;
-               DE_NULL,                                                    // const void*                          pNext;
-               0u,                                                         // VkPipelineDynamicStateCreateFlags    flags;
-               0u,                                                         // deUint32                             dynamicStateCount;
-               DE_NULL,                                                    // const VkDynamicState*                pDynamicStates;
-       };
-
        VkPipelineDepthStencilStateCreateInfo depthStencilStateParams =
        {
                VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO, // VkStructureType                          sType;
@@ -583,7 +574,7 @@ Move<VkPipeline> SimpleGraphicsPipelineBuilder::buildPipeline(tcu::UVec2 renderS
                &multisampleStateParams,                            // const VkPipelineMultisampleStateCreateInfo*      pMultisampleState;
                &depthStencilStateParams,                           // const VkPipelineDepthStencilStateCreateInfo*     pDepthStencilState;
                &colorBlendStateParams,                             // const VkPipelineColorBlendStateCreateInfo*       pColorBlendState;
-               &dynamicStateParams,                                // const VkPipelineDynamicStateCreateInfo*          pDynamicState;
+               (const VkPipelineDynamicStateCreateInfo*)DE_NULL,   // const VkPipelineDynamicStateCreateInfo*          pDynamicState;
                *m_pipelineLayout,                                  // VkPipelineLayout                                 layout;
                renderPass,                                         // VkRenderPass                                     renderPass;
                0u,                                                 // deUint32                                         subpass;

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
index f23921b..c5c2507 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexInputTests.cpp
@@ -918,15 +918,6 @@ VertexInputInstance::VertexInputInstance (Context&                                                                                         context,
                        false                                                                                                           // VkBool32                                                                     alphaToOneEnable;
                };
 
-               const VkPipelineDynamicStateCreateInfo  dynamicStateParams              =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       0u,                                                                                                                     // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                VkPipelineDepthStencilStateCreateInfo depthStencilStateParams =
                {
                        VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO,     // VkStructureType                                                      sType;
@@ -976,7 +967,7 @@ VertexInputInstance::VertexInputInstance (Context&                                                                                          context,
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        &depthStencilStateParams,                                                       // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateParams,                                                            // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
index 4a40487..12ce3ba 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
+++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
@@ -1163,15 +1163,6 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void
                        { 0.0f, 0.0f, 0.0f, 0.0f }                                                                              // float                                                                                blendConst[4];
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateInfo =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                                                      sType;
-                       DE_NULL,                                                                                                        // const void*                                                                          pNext;
-                       (VkPipelineDynamicStateCreateFlags)0,                                           // VkPipelineDynamicStateCreateFlags                            flags;
-                       0u,                                                                                                                     // deUint32                                                                                     dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                                        pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -1187,7 +1178,7 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        DE_NULL,                                                                                        // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateInfo,                                                                      // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *pipelineLayout,                                                                        // VkPipelineLayout                                                                     layout;
                        *renderPass,                                                                            // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;
@@ -2593,15 +2584,6 @@ void TessellationExecutor::renderTess (const Context& ctx, deUint32 vertexCount)
                        { 0.0f, 0.0f, 0.0f, 0.0f }                                                                      // float                                                                                blendConst[4];
                };
 
-               const VkPipelineDynamicStateCreateInfo dynamicStateInfo =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                                              sType;
-                       DE_NULL,                                                                                                        // const void*                                                  pNext;
-                       (VkPipelineDynamicStateCreateFlags)0,                                           // VkPipelineDynamicStateCreateFlags    flags;
-                       0u,                                                                                                                     // deUint32                                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                                pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo graphicsPipelineParams =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -2617,7 +2599,7 @@ void TessellationExecutor::renderTess (const Context& ctx, deUint32 vertexCount)
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        DE_NULL,                                                                                        // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateInfo,                                                                      // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *pipelineLayout,                                                                        // VkPipelineLayout                                                                     layout;
                        *renderPass,                                                                            // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
index c5fe8af..1fdce58 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
@@ -1436,15 +1436,6 @@ void ShaderRenderCaseInstance::render (tcu::Surface& result, const QuadGrid& qua
                        { 0.0f, 0.0f, 0.0f, 0.0f },                                                                     // float                                                                                blendConst[4];
                };
 
-               const VkPipelineDynamicStateCreateInfo                  dynamicStateInfo                        =
-               {
-                       VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,           // VkStructureType                              sType;
-                       DE_NULL,                                                                                                        // const void*                                  pNext;
-                       (VkPipelineDynamicStateCreateFlags)0,
-                       0u,                                                                                                                     // deUint32                                             dynamicStateCount;
-                       DE_NULL                                                                                                         // const VkDynamicState*                pDynamicStates;
-               };
-
                const VkGraphicsPipelineCreateInfo                              graphicsPipelineParams          =
                {
                        VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -1460,7 +1451,7 @@ void ShaderRenderCaseInstance::render (tcu::Surface& result, const QuadGrid& qua
                        &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                        DE_NULL,                                                                                        // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                        &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-                       &dynamicStateInfo,                                                                      // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+                       (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                        *m_pipelineLayout,                                                                      // VkPipelineLayout                                                                     layout;
                        *m_renderPass,                                                                          // VkRenderPass                                                                         renderPass;
                        0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 50f6949..eb58bdc 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -5056,15 +5056,6 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan
                &attBlendParams,                                                                                        //      const VkPipelineColorBlendAttachmentState*      pAttachments;
                { 0.0f, 0.0f, 0.0f, 0.0f },                                                                     //      float                                                                           blendConst[4];
        };
-       const VkPipelineDynamicStateCreateInfo  dynamicStateInfo                =
-       {
-               VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,   //      VkStructureType                 sType;
-               DE_NULL,                                                                                                //      const void*                             pNext;
-               (VkPipelineDynamicStateCreateFlags)0,
-               0u,                                                                                                             //      deUint32                                dynamicStateCount;
-               DE_NULL                                                                                                 //      const VkDynamicState*   pDynamicStates;
-       };
-
        const VkPipelineTessellationStateCreateInfo     tessellationState       =
        {
                VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO,
@@ -5089,7 +5080,7 @@ TestStatus runAndVerifyDefaultPipeline (Context& context, InstanceContext instan
                &multisampleParams,                                                                             //      const VkPipelineMultisampleStateCreateInfo*             pMultisampleState;
                &depthStencilParams,                                                                    //      const VkPipelineDepthStencilStateCreateInfo*    pDepthStencilState;
                &blendParams,                                                                                   //      const VkPipelineColorBlendStateCreateInfo*              pColorBlendState;
-               &dynamicStateInfo,                                                                              //      const VkPipelineDynamicStateCreateInfo*                 pDynamicState;
+               (const VkPipelineDynamicStateCreateInfo*)DE_NULL,               //      const VkPipelineDynamicStateCreateInfo*                 pDynamicState;
                *pipelineLayout,                                                                                //      VkPipelineLayout                                                                layout;
                *renderPass,                                                                                    //      VkRenderPass                                                                    renderPass;
                0u,                                                                                                             //      deUint32                                                                                subpass;

diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
index 5583733..2bde968 100644 (file)
--- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
+++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
@@ -1917,15 +1917,6 @@ vk::Move<VkPipeline> UniformBlockCaseInstance::createPipeline (vk::VkShaderModul
                { 0.0f, 0.0f, 0.0f, 0.0f },                                                                     // float                                                                                blendConstants[4];
        };
 
-       const VkPipelineDynamicStateCreateInfo                  dynamicStateInfo                        =
-       {
-               VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,   // VkStructureType                                              sType;
-               DE_NULL,                                                                                                // const void*                                                  pNext;
-               0u,                                                                                                             // VkPipelineDynamicStateCreateFlags    flags;
-               0u,                                                                                                             // deUint32                                                             dynamicStateCount;
-               DE_NULL                                                                                                 // const VkDynamicState*                                pDynamicStates;
-       };
-
        const VkGraphicsPipelineCreateInfo                              graphicsPipelineParams          =
        {
                VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,        // VkStructureType                                                                      sType;
@@ -1941,7 +1932,7 @@ vk::Move<VkPipeline> UniformBlockCaseInstance::createPipeline (vk::VkShaderModul
                &multisampleStateParams,                                                        // const VkPipelineMultisampleStateCreateInfo*          pMultisampleState;
                DE_NULL,                                                                                        // const VkPipelineDepthStencilStateCreateInfo*         pDepthStencilState;
                &colorBlendStateParams,                                                         // const VkPipelineColorBlendStateCreateInfo*           pColorBlendState;
-               &dynamicStateInfo,                                                                      // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
+               (const VkPipelineDynamicStateCreateInfo*)DE_NULL,       // const VkPipelineDynamicStateCreateInfo*                      pDynamicState;
                pipelineLayout,                                                                         // VkPipelineLayout                                                                     layout;
                renderPass,                                                                                     // VkRenderPass                                                                         renderPass;
                0u,                                                                                                     // deUint32                                                                                     subpass;

diff --git a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
index b5efc7f..3bb7a74 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
+++ b/external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
@@ -1672,14 +1672,6 @@ Move<VkPipeline> createSubpassPipeline (const DeviceInterface&           vk,
                attachmentBlendStates.empty() ? DE_NULL : &attachmentBlendStates[0],// pAttachments
                { 0.0f, 0.0f, 0.0f, 0.0f }                                                                                      // blendConst
        };
-       const VkPipelineDynamicStateCreateInfo dynamicState =
-       {
-               VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,
-               DE_NULL,
-               (VkPipelineDynamicStateCreateFlags)0u,
-               0,
-               DE_NULL
-       };
        const VkGraphicsPipelineCreateInfo createInfo =
        {
                VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,                // sType
@@ -1697,7 +1689,7 @@ Move<VkPipeline> createSubpassPipeline (const DeviceInterface&            vk,
                &multisampleState,                                                                              // pMultisampleState
                &depthStencilState,                                                                             // pDepthStencilState
                &blendState,                                                                                    // pColorBlendState
-               &dynamicState,                                                                                  // pDynamicState
+               (const VkPipelineDynamicStateCreateInfo*)DE_NULL,               // pDynamicState
                pipelineLayout,                                                                                 // layout
 
                renderPass,                                                                                             // renderPass

diff --git a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp
index 0a39c3c..24b22a1 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp
+++ b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp
@@ -1193,14 +1193,6 @@ Move<vk::VkPipeline> createPipeline (Context&                                    context,
                &attBlendParams,                                                                                                        // pAttachments
                { 0.0f, 0.0f, 0.0f, 0.0f },                                                                                     // blendConstants
        };
-       const vk::VkPipelineDynamicStateCreateInfo                      dynStateParams                  =
-       {
-               vk::VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,                       // sType
-               DE_NULL,                                                                                                                        // pNext
-               (vk::VkPipelineDynamicStateCreateFlags)0,
-               0u,                                                                                                                                     // dynamicStateCount
-               DE_NULL,                                                                                                                        // pDynamicStates
-       };
        const vk::VkGraphicsPipelineCreateInfo                          pipelineParams                  =
        {
                vk::VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,                            // sType
@@ -1216,7 +1208,7 @@ Move<vk::VkPipeline> createPipeline (Context&                                     context,
                &multisampleParams,                                                                                                     // pMultisampleState
                &depthStencilParams,                                                                                            // pDepthStencilState
                &blendParams,                                                                                                           // pColorBlendState
-               &dynStateParams,                                                                                                        // pDynamicState
+               (const vk::VkPipelineDynamicStateCreateInfo*)DE_NULL,                           // pDynamicState
                pipelineLayout,                                                                                                         // layout
                renderPass,                                                                                                                     // renderPass
                0u,                                                                                                                                     // subpass

diff --git a/external/vulkancts/modules/vulkan/vktSynchronization.cpp b/external/vulkancts/modules/vulkan/vktSynchronization.cpp
index fb04e82..7e7a9fe 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktSynchronization.cpp
+++ b/external/vulkancts/modules/vulkan/vktSynchronization.cpp
@@ -696,7 +696,6 @@ void generateWork (TestContext& testContext)
        VkPipelineDepthStencilStateCreateInfo           depthStencilState;
        VkPipelineColorBlendAttachmentState                     blendAttachment;
        VkPipelineColorBlendStateCreateInfo                     blendState;
-       VkPipelineDynamicStateCreateInfo                        dynamicState;
        VkPipelineLayoutCreateInfo                                      pipelineLayoutState;
        VkGraphicsPipelineCreateInfo                            pipelineState;
        VkPipelineCacheCreateInfo                                       cacheState;
@@ -867,12 +866,6 @@ void generateWork (TestContext& testContext)
        blendState.attachmentCount                                      = 1;
        blendState.pAttachments                                         = &blendAttachment;
 
-       dynamicState.sType                                                      = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
-       dynamicState.pNext                                                      = DE_NULL;
-       dynamicState.flags                                                      = 0;
-       dynamicState.dynamicStateCount                          = 0;
-       dynamicState.pDynamicStates                                     = DE_NULL;
-
        pipelineLayoutState.sType                                       = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
        pipelineLayoutState.pNext                                       = DE_NULL;
        pipelineLayoutState.flags                                       = 0;
@@ -895,7 +888,7 @@ void generateWork (TestContext& testContext)
        pipelineState.pMultisampleState                         = &multisampleState;
        pipelineState.pDepthStencilState                        = &depthStencilState;
        pipelineState.pColorBlendState                          = &blendState;
-       pipelineState.pDynamicState                                     = &dynamicState;
+       pipelineState.pDynamicState                                     = (const VkPipelineDynamicStateCreateInfo*)DE_NULL;
        pipelineState.layout                                            = layout;
        pipelineState.renderPass                                        = renderPass.get();
        pipelineState.subpass                                           = 0;