commit 0e0fb5cdf0f53e118ad3a405c3b881ef2ef4147d
author Mark Lobodzinski <mark@lunarg.com> Tue Jun 23 15:11:57 2015 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue Jun 23 15:11:57 2015 -0600
tree 0acaec9065851e5188ae8e9870e749180c9e1458
parent 14305ad4363dd22e47118a76bc89376e5b291645

vulkan.h: V104 -- Unify compute/graphics pipeline shader passing semantics, Bug# 13800

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 8218a0d..a93d8f9 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1052,23 +1052,30 @@
     err = vkCreateShader(m_device->device(), &vs_ci, &vs);
     ASSERT_VK_SUCCESS(err);
 
-    const VkPipelineShader vs_pipe_shader = {
+    const VkPipelineShaderStageCreateInfo pipe_vs_ci = {
+        .sType                = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+        .pNext                = NULL,
         .stage                = VK_SHADER_STAGE_VERTEX,
         .shader               = vs,
         .linkConstBufferCount = 0,
         .pLinkConstBufferInfo = NULL,
         .pSpecializationInfo  = NULL,
     };
-    const VkPipelineShaderStageCreateInfo pipe_vs_ci = {
-        .sType  = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
-        .pNext  = NULL,
-        .shader = vs_pipe_shader,
-    };
     const VkGraphicsPipelineCreateInfo gp_ci = {
-        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
-        .pNext = &pipe_vs_ci,
-        .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
-        .layout = pipeline_layout,
+        .sType             = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+        .pNext             = NULL,
+        .stageCount        = 1,
+        .pStages           = &pipe_vs_ci,
+        .pVertexInputState = NULL,
+        .pIaState          = NULL,
+        .pTessState        = NULL,
+        .pVpState          = NULL,
+        .pRsState          = NULL,
+        .pMsState          = NULL,
+        .pDsState          = NULL,
+        .pCbState          = NULL,
+        .flags             = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+        .layout            = pipeline_layout,
     };
 
     VkPipeline pipeline;
@@ -1174,23 +1181,30 @@
     VkShader vs;
     err = vkCreateShader(m_device->device(), &vs_ci, &vs);
 
-    const VkPipelineShader vs_pipe_shader = {
+    const VkPipelineShaderStageCreateInfo pipe_vs_ci = {
+        .sType  = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+        .pNext  = NULL,
         .stage                = VK_SHADER_STAGE_VERTEX,
         .shader               = vs,
         .linkConstBufferCount = 0,
         .pLinkConstBufferInfo = NULL,
         .pSpecializationInfo  = NULL,
     };
-    const VkPipelineShaderStageCreateInfo pipe_vs_ci = {
-        .sType  = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
-        .pNext  = NULL,
-        .shader = vs_pipe_shader,
-    };
     const VkGraphicsPipelineCreateInfo gp_ci = {
-        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
-        .pNext = &pipe_vs_ci,
-        .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
-        .layout = pipeline_layout,
+        .sType             = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+        .pNext             = NULL,
+        .stageCount        = 1,
+        .pStages           = &pipe_vs_ci,
+        .pVertexInputState = NULL,
+        .pIaState          = NULL,
+        .pTessState        = NULL,
+        .pVpState          = NULL,
+        .pRsState          = NULL,
+        .pMsState          = NULL,
+        .pDsState          = NULL,
+        .pCbState          = NULL,
+        .flags             = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+        .layout            = pipeline_layout,
     };
 
     VkPipeline pipeline;
@@ -1651,23 +1665,30 @@
     err = vkCreateShader(m_device->device(), &vs_ci, &vs);
     ASSERT_VK_SUCCESS(err);
 
-    const VkPipelineShader vs_pipe_shader = {
+    const VkPipelineShaderStageCreateInfo pipe_vs_ci = {
+        .sType                = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
+        .pNext                = NULL,
         .stage                = VK_SHADER_STAGE_VERTEX,
         .shader               = vs,
         .linkConstBufferCount = 0,
         .pLinkConstBufferInfo = NULL,
         .pSpecializationInfo  = NULL,
     };
-    const VkPipelineShaderStageCreateInfo pipe_vs_ci = {
-        .sType  = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
-        .pNext  = &pipe_ms_state_ci,
-        .shader = vs_pipe_shader,
-    };
     const VkGraphicsPipelineCreateInfo gp_ci = {
-        .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
-        .pNext = &pipe_vs_ci,
-        .flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
-        .layout = pipeline_layout,
+        .sType             = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,
+        .pNext             = NULL,
+        .stageCount        = 1,
+        .pStages           = &pipe_vs_ci,
+        .pVertexInputState = NULL,
+        .pIaState          = NULL,
+        .pTessState        = NULL,
+        .pVpState          = NULL,
+        .pRsState          = NULL,
+        .pMsState          = &pipe_ms_state_ci,
+        .pDsState          = NULL,
+        .pCbState          = NULL,
+        .flags             = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT,
+        .layout            = pipeline_layout,
     };
 
     VkPipeline pipeline;