Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/main

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / multiview / vktMultiViewRenderUtil.cpp

diff --git a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp
index a97a36e..d5f2bec 100644 (file)
--- a/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp
+++ b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderUtil.cpp
@@ -252,7 +252,7 @@ Move<VkRenderPass> makeRenderPass (const DeviceInterface&           vk,
 
        const VkRenderPassMultiviewCreateInfo           renderPassMultiviewInfo         =
        {
-               VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR,                        // VkStructureType      sType;
+               VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,                            // VkStructureType      sType;
                DE_NULL,                                                                                                                        // const void*          pNext;
                subpassCount,                                                                                                           // uint32_t                     subpassCount;
                &viewMasks[0],                                                                                                          // const uint32_t*      pViewMasks;
@@ -274,7 +274,7 @@ Move<VkRenderPass> makeRenderPass (const DeviceInterface&           vk,
        vector <SubpassDep>                                                     subpassDependencies;
        for(deUint32 subpassNdx = 0u; subpassNdx < subpassCount; ++subpassNdx)
        {
-               const auto dependencyFlags = (subpassNdx == subpassCount - 1u) ? (VK_DEPENDENCY_BY_REGION_BIT | VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR) : VK_DEPENDENCY_VIEW_LOCAL_BIT;
+               const auto dependencyFlags = (subpassNdx == subpassCount - 1u) ? (VK_DEPENDENCY_BY_REGION_BIT | VK_DEPENDENCY_VIEW_LOCAL_BIT) : VK_DEPENDENCY_VIEW_LOCAL_BIT;
 
                const SubpassDep                                                subpassDependency                       //  VkSubpassDependency                                                                                 ||  VkSubpassDependency2KHR
                (
@@ -456,7 +456,7 @@ Move<VkRenderPass> makeRenderPassWithAttachments (const DeviceInterface&    vk,
 
        const VkRenderPassMultiviewCreateInfo           renderPassMultiviewInfo         =
        {
-               VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO_KHR,        //VkStructureType       sType;
+               VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO,            //VkStructureType       sType;
                DE_NULL,                                                                                                        //const void*           pNext;
                subpassCount,                                                                                           //uint32_t                      subpassCount;
                &viewMasks[0],                                                                                          //const uint32_t*       pViewMasks;
@@ -472,7 +472,7 @@ Move<VkRenderPass> makeRenderPassWithAttachments (const DeviceInterface&    vk,
        vector <SubpassDep>                                                     subpassDependencies;
        for(deUint32 subpassNdx = 0u; subpassNdx < subpassCount; ++subpassNdx)
        {
-               const auto dependencyFlags = (subpassNdx == subpassCount - 1u) ? (VK_DEPENDENCY_BY_REGION_BIT | VK_DEPENDENCY_VIEW_LOCAL_BIT_KHR) : VK_DEPENDENCY_VIEW_LOCAL_BIT;
+               const auto dependencyFlags = (subpassNdx == subpassCount - 1u) ? (VK_DEPENDENCY_BY_REGION_BIT | VK_DEPENDENCY_VIEW_LOCAL_BIT) : VK_DEPENDENCY_VIEW_LOCAL_BIT;
 
                const SubpassDep                                                subpassDependency                       //  VkSubpassDependency                                                                                 ||  VkSubpassDependency2KHR
                (