Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: Ib7a8d1973b881cb59b750ac9e2c291bc2602f559

diff --git a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp
index 5db79ef..a6d9f5f 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiSmokeTests.cpp
@@ -595,7 +595,7 @@ tcu::TestStatus renderTriangleTest (Context& context)
                VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO,     // sType
                DE_NULL,                                                                                                        // pNext
                0u,                                                                                                                     // flags
-               VK_TRUE,                                                                                                        // depthClampEnable
+               VK_FALSE,                                                                                                       // depthClampEnable
                VK_FALSE,                                                                                                       // rasterizerDiscardEnable
                VK_POLYGON_MODE_FILL,                                                                           // polygonMode
                VK_CULL_MODE_NONE,                                                                                      // cullMode

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp
index 540e511..53a0450 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiDisplayTimingTests.cpp
@@ -1095,7 +1095,7 @@ void DisplayTimingTestInstance::render (void)
        deUint32                        imageIndex;
 
        // Acquire next image
-       VK_CHECK(m_vkd.acquireNextImageKHR(*m_device, *m_swapchain, foreverNs, currentAcquireSemaphore, fence, &imageIndex));
+       VK_CHECK(m_vkd.acquireNextImageKHR(*m_device, *m_swapchain, foreverNs, currentAcquireSemaphore, (vk::VkFence)0, &imageIndex));
 
        // Create command buffer
        m_commandBuffers[m_frameNdx % m_commandBuffers.size()] = createCommandBuffer(m_vkd, *m_device, *m_commandPool, *m_pipelineLayout, *m_renderPass, m_framebuffers[imageIndex], *m_pipeline, m_frameNdx, m_quadCount, width, height).disown();
@@ -1208,7 +1208,7 @@ void DisplayTimingTestInstance::render (void)
                        &currentRenderSemaphore
                };
 
-               VK_CHECK(m_vkd.queueSubmit(m_queue, 1u, &submitInfo, (vk::VkFence)0));
+               VK_CHECK(m_vkd.queueSubmit(m_queue, 1u, &submitInfo, fence));
        }
 
        // Present frame

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
index d01c7a8..176d7cd 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
@@ -1398,7 +1398,7 @@ tcu::TestStatus basicRenderTest (Context& context, Type wsiType)
                                                                                                                                                  *swapchain,
                                                                                                                                                  std::numeric_limits<deUint64>::max(),
                                                                                                                                                  imageReadySemaphore,
-                                                                                                                                                 imageReadyFence,
+                                                                                                                                                 (VkFence)0,
                                                                                                                                                  &imageNdx);
 
                                if (acquireResult == VK_SUBOPTIMAL_KHR)
@@ -1438,7 +1438,7 @@ tcu::TestStatus basicRenderTest (Context& context, Type wsiType)
                                };
 
                                renderer.recordFrame(commandBuffer, imageNdx, frameNdx);
-                               VK_CHECK(vkd.queueSubmit(devHelper.queue, 1u, &submitInfo, (VkFence)0));
+                               VK_CHECK(vkd.queueSubmit(devHelper.queue, 1u, &submitInfo, imageReadyFence));
                                VK_CHECK(vkd.queuePresentKHR(devHelper.queue, &presentInfo));
                        }
                }