Skip to content

layers: Revert old swapchain fix #11993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artem-lunarg merged 1 commit into from
Mar 27, 2026
+4 −63
Merged

layers: Revert old swapchain fix #11993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions layers/core_checks/cc_submit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Copyright (c) 2025 The Khronos Group Inc.
* Copyright (c) 2025 Valve Corporation
* Copyright (c) 2025 LunarG, Inc.
/* Copyright (c) 2026 The Khronos Group Inc.
* Copyright (c) 2026 Valve Corporation
* Copyright (c) 2026 LunarG, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -85,9 +85,7 @@ void QueueSubmissionValidator::Validate(const vvl::QueueSubmission& submission)
}

// Check that image being presented has correct layout
// NOTE: Do separate check that swapchain and its images are not destroyed at this point.
// For example, you can destroy swapchain after it was used as the old swapchain.
if (submission.swapchain && !submission.swapchain_image->Destroyed()) {
if (submission.swapchain) {
std::vector<VkImageLayout> layouts;
if (submission.swapchain_image && FindLayouts(*submission.swapchain_image, layouts)) {
for (auto layout : layouts) {
Expand Down
57 changes: 0 additions & 57 deletions tests/unit/wsi_positive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2793,63 +2793,6 @@ TEST_F(PositiveWsi, DestroySemaphoreUsedByOldSwapchain2) {
m_default_queue->Wait();
}

TEST_F(PositiveWsi, DestroySwapchainBeforeLayoutValidation) {
Copy link
Copy Markdown
Contributor

@spencer-lunarg spencer-lunarg Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would this be a negative test now?

Copy link
Copy Markdown
Contributor Author

@artem-lunarg artem-lunarg Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think so, will add in the next PR

Copy link
Copy Markdown
Contributor Author

@artem-lunarg artem-lunarg Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#11994

// https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/10455
TEST_DESCRIPTION("Delete swapchain before global layout validation takes place");
SetTargetApiVersion(VK_API_VERSION_1_3);
AddSurfaceExtension();
AddRequiredExtensions(VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME);
AddRequiredExtensions(VK_EXT_SWAPCHAIN_MAINTENANCE_1_EXTENSION_NAME);
AddRequiredFeature(vkt::Feature::swapchainMaintenance1);
AddRequiredFeature(vkt::Feature::synchronization2);
RETURN_IF_SKIP(Init());
RETURN_IF_SKIP(InitSurface());
const SurfaceInformation info = GetSwapchainInfo(m_surface);

VkSwapchainCreateInfoKHR swapchain_ci = vku::InitStructHelper();
swapchain_ci.surface = m_surface;
swapchain_ci.minImageCount = info.surface_capabilities.minImageCount;
swapchain_ci.imageFormat = info.surface_formats[0].format;
swapchain_ci.imageColorSpace = info.surface_formats[0].colorSpace;
swapchain_ci.imageExtent = info.surface_capabilities.minImageExtent;
swapchain_ci.imageArrayLayers = 1;
swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
swapchain_ci.preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
swapchain_ci.compositeAlpha = info.surface_composite_alpha;
swapchain_ci.presentMode = VK_PRESENT_MODE_FIFO_KHR;
vkt::Swapchain swapchain(*m_device, swapchain_ci);

const auto swapchain_images = swapchain.GetImages();

vkt::Semaphore render_semaphore(*m_device);
vkt::Fence fence(*m_device);

const uint32_t image_index = swapchain.AcquireNextImage(fence, kWaitTimeout);
fence.Wait(kWaitTimeout);

VkImageMemoryBarrier2 layout_transition = vku::InitStructHelper();
layout_transition.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
layout_transition.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
layout_transition.image = swapchain_images[image_index];
layout_transition.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};

m_command_buffer.Begin();
m_command_buffer.Barrier(layout_transition);
m_command_buffer.End();

m_default_queue->Submit(m_command_buffer, vkt::Signal(render_semaphore));
m_default_queue->Present(swapchain, image_index, render_semaphore);

swapchain_ci.oldSwapchain = swapchain.handle();
vkt::Swapchain swapchain2(*m_device, swapchain_ci);
swapchain.Destroy();

// In current implementation global layout validation is performed by the queue threads and it happens
// usually at sync points, for example, during the next Wait(). Test that layout validation does not
// cause false positives here.
m_default_queue->Wait();
}

TEST_F(PositiveWsi, PresentModeFifoLatestReady) {
TEST_DESCRIPTION("Create a swapchain with present mode VK_PRESENT_MODE_FIFO_LATEST_READY_KHR");
SetTargetApiVersion(VK_API_VERSION_1_1);
Expand Down
Loading