Fix: Swapchain recreation - validation errors (KhronosGroup#1319)

* Fix: Incorrect enablement swapchain maintenance1

* Copyright

* Introduces allow_maintenance1 to remove th dual use of has_maitenance1

* Improved comment

Author: jeroenbakker-atmind

samples/api/swapchain_recreation/swapchain_recreation.cpp

@@ -904,6 +904,7 @@ SwapchainRecreation::SwapchainRecreation()
 	else
 	{
 		LOGI("Disabling usage of VK_EXT_surface_maintenance1 due to USE_MAINTENANCE1=no");
+		allow_maintenance1 = false;
 	}
 }
 
@@ -973,6 +974,17 @@ SwapchainRecreation::~SwapchainRecreation()
 	}
 }
 
+void SwapchainRecreation::request_gpu_features(vkb::PhysicalDevice &gpu)
+{
+	if (allow_maintenance1)
+	{
+		REQUEST_OPTIONAL_FEATURE(gpu,
+		                         VkPhysicalDeviceSwapchainMaintenance1FeaturesEXT,
+		                         VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SWAPCHAIN_MAINTENANCE_1_FEATURES_EXT,
+		                         swapchainMaintenance1);
+	}
+}
+
 std::unique_ptr<vkb::Device> SwapchainRecreation::create_device(vkb::PhysicalDevice &gpu)
 {
 	std::unique_ptr<vkb::Device> device = vkb::VulkanSampleC::create_device(gpu);

samples/api/swapchain_recreation/swapchain_recreation.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2023-2024, Google
+/* Copyright (c) 2023-2025, Google
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -112,8 +112,12 @@ class SwapchainRecreation : public vkb::VulkanSampleC
 	/// Submission and present queue.
 	const vkb::Queue *queue = nullptr;
 
+	/// Allow enabling VK_EXT_surface_maintenance1 and VK_EXT_swapchain_maintenance1.
+	///
+	/// Can be set to false by setting environment variable `USE_MAINTENANCE1=no`
+	bool allow_maintenance1 = true;
 	/// Whether the VK_EXT_surface_maintenance1 and VK_EXT_swapchain_maintenance1 extensions are
-	/// to be used.
+	/// enabled.
 	bool has_maintenance1 = false;
 
 	/// Surface data.
@@ -168,6 +172,8 @@ class SwapchainRecreation : public vkb::VulkanSampleC
 	// User toggles.
 	bool recreate_swapchain_on_present_mode_change = false;
 
+	// from vkb::VulkanSample
+	void                         request_gpu_features(vkb::PhysicalDevice &gpu) override;
 	std::unique_ptr<vkb::Device> create_device(vkb::PhysicalDevice &gpu) override;
 
 	void get_queue();