dEQP-VK.pipeline.graphics_library

Include VkGraphicsPipelineLibraryCreateInfoEXT into chain
for empty flags.

Affected test:
 * dEQP-VK.pipeline.graphics_library.*

Components: Vulkan

VK-GL-CTS issue: 3553

Change-Id: I93a5a4dcc4dacc8a57cbb57834c4faa5f9485f16

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp
index 7b22036..d7de1a7 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineLibraryTests.cpp
@@ -132,17 +132,6 @@ inline std::string getTestName (const PipelineTreeConfiguration& pipelineTreeCon
        return result;
 }
 
-inline bool isPartialFlagSubset (const VkFlags test, const VkFlags fullSet)
-{
-       if ((test & fullSet) == 0)
-               return false;
-
-       if ((test & fullSet) == fullSet)
-               return false;
-
-       return true;
-}
-
 inline VkPipelineCreateFlags calcPipelineCreateFlags (bool optimize, bool buildLibrary)
 {
        VkPipelineCreateFlags   result = 0;
@@ -888,7 +877,7 @@ bool PipelineLibraryTestInstance::runTest (RuntimePipelineTreeConfiguration&        run
                        }
                }
 
-               if (isPartialFlagSubset(graphicsPipelineLibraryCreateInfo.flags, ALL_GRAPHICS_PIPELINE_LIBRARY_FLAGS))
+               if (graphicsPipelineLibraryCreateInfo.flags != ALL_GRAPHICS_PIPELINE_LIBRARY_FLAGS)
                        appendStructurePtrToVulkanChain(&graphicsPipelineCreateInfo.pNext, &graphicsPipelineLibraryCreateInfo);
 
                if (linkingInfo.libraryCount != 0)