Use pipeline layout alongside with fragment shader stage

In pipeline libraries, pipeline layout is requried if fragment
shader is present in the pipeline.

Affects: dEQP-VK.pipeline.pipeline_library.graphics_library.misc.bind_null_descriptor_set.*

VK-GL-CTS Issue: 4096

Components: Vulkan
Change-Id: Ia70b0f18f497e2e9102e7748c87ea5e5092098bc

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp
index 816c4f6..185e7ba 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp
@@ -1420,6 +1420,12 @@ tcu::TestStatus PipelineLibraryMiscTestInstance::runNullDescriptorSet(void)
 
                fragPipelineLayout = createPipelineLayout(vk, device, &pipelineLayoutCreateInfo);
        }
+       else
+       {
+               pipelineLayoutCreateInfo.setLayoutCount = 0u;
+               pipelineLayoutCreateInfo.pSetLayouts    = DE_NULL;
+               fragPipelineLayout = createPipelineLayout(vk, device, &pipelineLayoutCreateInfo);
+       }
 
        // create descriptor pool
        Move<VkDescriptorPool> descriptorPool = DescriptorPoolBuilder()