diff --git a/attachments/03_physical_device_selection.cpp b/attachments/03_physical_device_selection.cpp index 5cc61133..9a889eb8 100644 --- a/attachments/03_physical_device_selection.cpp +++ b/attachments/03_physical_device_selection.cpp @@ -48,10 +48,7 @@ class HelloTriangleApplication vk::raii::PhysicalDevice physicalDevice = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/04_logical_device.cpp b/attachments/04_logical_device.cpp index 66da648d..725230cd 100644 --- a/attachments/04_logical_device.cpp +++ b/attachments/04_logical_device.cpp @@ -52,10 +52,7 @@ class HelloTriangleApplication vk::raii::Queue graphicsQueue = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/05_window_surface.cpp b/attachments/05_window_surface.cpp index 4fbc4932..6607ecb0 100644 --- a/attachments/05_window_surface.cpp +++ b/attachments/05_window_surface.cpp @@ -49,10 +49,7 @@ class HelloTriangleApplication vk::raii::Queue queue = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/06_swap_chain_creation.cpp b/attachments/06_swap_chain_creation.cpp index 424bf0f2..65a498a4 100644 --- a/attachments/06_swap_chain_creation.cpp +++ b/attachments/06_swap_chain_creation.cpp @@ -56,10 +56,7 @@ class HelloTriangleApplication std::vector swapChainImageViews; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/07_image_views.cpp b/attachments/07_image_views.cpp index c2a2a8e8..fec53df9 100644 --- a/attachments/07_image_views.cpp +++ b/attachments/07_image_views.cpp @@ -56,10 +56,7 @@ class HelloTriangleApplication std::vector swapChainImageViews; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/08_graphics_pipeline.cpp b/attachments/08_graphics_pipeline.cpp index 8c6a60c8..b0953f1f 100644 --- a/attachments/08_graphics_pipeline.cpp +++ b/attachments/08_graphics_pipeline.cpp @@ -56,10 +56,7 @@ class HelloTriangleApplication std::vector swapChainImageViews; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/09_shader_modules.cpp b/attachments/09_shader_modules.cpp index 24ddf95c..6af17f26 100644 --- a/attachments/09_shader_modules.cpp +++ b/attachments/09_shader_modules.cpp @@ -57,10 +57,7 @@ class HelloTriangleApplication std::vector swapChainImageViews; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/10_fixed_functions.cpp b/attachments/10_fixed_functions.cpp index f90ee1ef..b232d1cc 100644 --- a/attachments/10_fixed_functions.cpp +++ b/attachments/10_fixed_functions.cpp @@ -59,10 +59,7 @@ class HelloTriangleApplication vk::raii::PipelineLayout pipelineLayout = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/12_graphics_pipeline_complete.cpp b/attachments/12_graphics_pipeline_complete.cpp index 06c19c1b..0daca5de 100644 --- a/attachments/12_graphics_pipeline_complete.cpp +++ b/attachments/12_graphics_pipeline_complete.cpp @@ -60,10 +60,7 @@ class HelloTriangleApplication vk::raii::Pipeline graphicsPipeline = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/14_command_buffers.cpp b/attachments/14_command_buffers.cpp index 77c9d7ae..3c24d50c 100644 --- a/attachments/14_command_buffers.cpp +++ b/attachments/14_command_buffers.cpp @@ -63,10 +63,7 @@ class HelloTriangleApplication vk::raii::CommandBuffer commandBuffer = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/15_hello_triangle.cpp b/attachments/15_hello_triangle.cpp index d4edc4f4..0154fac2 100644 --- a/attachments/15_hello_triangle.cpp +++ b/attachments/15_hello_triangle.cpp @@ -68,10 +68,7 @@ class HelloTriangleApplication vk::raii::Fence drawFence = nullptr; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/16_frames_in_flight.cpp b/attachments/16_frames_in_flight.cpp index a5095b44..142bb4a0 100644 --- a/attachments/16_frames_in_flight.cpp +++ b/attachments/16_frames_in_flight.cpp @@ -70,10 +70,7 @@ class HelloTriangleApplication uint32_t frameIndex = 0; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp index a1ada280..ee63b64a 100644 --- a/attachments/17_swap_chain_recreation.cpp +++ b/attachments/17_swap_chain_recreation.cpp @@ -72,10 +72,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp index 10061e61..56bb835a 100644 --- a/attachments/18_vertex_input.cpp +++ b/attachments/18_vertex_input.cpp @@ -97,10 +97,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp index 07fc80d2..f1e4b2b2 100644 --- a/attachments/19_vertex_buffer.cpp +++ b/attachments/19_vertex_buffer.cpp @@ -100,10 +100,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp index 28f1f40b..90ecfa0e 100644 --- a/attachments/20_staging_buffer.cpp +++ b/attachments/20_staging_buffer.cpp @@ -100,10 +100,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp index e427a625..bbf1d76f 100644 --- a/attachments/21_index_buffer.cpp +++ b/attachments/21_index_buffer.cpp @@ -106,10 +106,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp index bb379979..64d2aded 100644 --- a/attachments/22_descriptor_layout.cpp +++ b/attachments/22_descriptor_layout.cpp @@ -122,10 +122,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp index 269a76a9..b29830ce 100644 --- a/attachments/23_descriptor_sets.cpp +++ b/attachments/23_descriptor_sets.cpp @@ -125,10 +125,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp index 5a622955..3d2e6dc6 100644 --- a/attachments/24_texture_image.cpp +++ b/attachments/24_texture_image.cpp @@ -131,10 +131,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp index 9bff8a0b..5795cdd8 100644 --- a/attachments/25_sampler.cpp +++ b/attachments/25_sampler.cpp @@ -133,10 +133,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp index b5d67f96..7964135c 100644 --- a/attachments/26_texture_mapping.cpp +++ b/attachments/26_texture_mapping.cpp @@ -135,10 +135,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp index 6fd30340..90e76e1c 100644 --- a/attachments/27_depth_buffering.cpp +++ b/attachments/27_depth_buffering.cpp @@ -148,8 +148,7 @@ class HelloTriangleApplication std::vector requiredDeviceExtension = { vk::KHRSwapchainExtensionName, vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSynchronization2ExtensionName}; void initWindow() { diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp index adc3e40d..9bbfeff7 100644 --- a/attachments/28_model_loading.cpp +++ b/attachments/28_model_loading.cpp @@ -154,10 +154,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp index 77347ebb..d4b840db 100644 --- a/attachments/29_mipmapping.cpp +++ b/attachments/29_mipmapping.cpp @@ -155,10 +155,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp index 3c0b58b1..9fe6594a 100644 --- a/attachments/30_multisampling.cpp +++ b/attachments/30_multisampling.cpp @@ -160,10 +160,7 @@ class HelloTriangleApplication bool framebufferResized = false; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/31_compute_shader.cpp b/attachments/31_compute_shader.cpp index 6b38a90a..52fe7259 100644 --- a/attachments/31_compute_shader.cpp +++ b/attachments/31_compute_shader.cpp @@ -127,10 +127,7 @@ class ComputeShaderApplication double lastTime = 0.0f; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; void initWindow() { diff --git a/attachments/37_multithreading.cpp b/attachments/37_multithreading.cpp index 90c60ff5..297b354d 100644 --- a/attachments/37_multithreading.cpp +++ b/attachments/37_multithreading.cpp @@ -229,10 +229,7 @@ class MultithreadedApplication std::vector particleGroups; std::vector requiredDeviceExtension = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName}; + vk::KHRSwapchainExtensionName}; // Helper functions [[nodiscard]] static std::vector getRequiredExtensions() diff --git a/en/03_Drawing_a_triangle/00_Setup/03_Physical_devices_and_queue_families.adoc b/en/03_Drawing_a_triangle/00_Setup/03_Physical_devices_and_queue_families.adoc index 54433872..d44738e4 100644 --- a/en/03_Drawing_a_triangle/00_Setup/03_Physical_devices_and_queue_families.adoc +++ b/en/03_Drawing_a_triangle/00_Setup/03_Physical_devices_and_queue_families.adoc @@ -165,11 +165,7 @@ Because we're just starting out, Vulkan 1.3 support is the only thing we need, [,c++] ---- std::vector deviceExtensions = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName -}; + vk::KHRSwapchainExtensionName}; void pickPhysicalDevice() { std::vector devices = instance.enumeratePhysicalDevices(); diff --git a/en/03_Drawing_a_triangle/00_Setup/04_Logical_device_and_queues.adoc b/en/03_Drawing_a_triangle/00_Setup/04_Logical_device_and_queues.adoc index c0205d7d..0b093671 100644 --- a/en/03_Drawing_a_triangle/00_Setup/04_Logical_device_and_queues.adoc +++ b/en/03_Drawing_a_triangle/00_Setup/04_Logical_device_and_queues.adoc @@ -119,11 +119,7 @@ For our application to work properly, we need to enable certain device extension [,c++] ---- std::vector deviceExtensions = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName -}; + vk::KHRSwapchainExtensionName}; ---- The `VK_KHR_swapchain` extension is required for presenting rendered images to the window. The other extensions provide additional functionality that we'll use in later parts of the tutorial. diff --git a/en/03_Drawing_a_triangle/01_Presentation/00_Window_surface.adoc b/en/03_Drawing_a_triangle/01_Presentation/00_Window_surface.adoc index b34ea731..5320128f 100644 --- a/en/03_Drawing_a_triangle/01_Presentation/00_Window_surface.adoc +++ b/en/03_Drawing_a_triangle/01_Presentation/00_Window_surface.adoc @@ -197,11 +197,7 @@ variable for the handle: vk::raii::Queue presentQueue; std::vector deviceExtensions = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName -}; + vk::KHRSwapchainExtensionName}; ---- Next, we need to modify the filtering logic to find the best queue families diff --git a/en/03_Drawing_a_triangle/01_Presentation/01_Swap_chain.adoc b/en/03_Drawing_a_triangle/01_Presentation/01_Swap_chain.adoc index d59256f6..1956f867 100644 --- a/en/03_Drawing_a_triangle/01_Presentation/01_Swap_chain.adoc +++ b/en/03_Drawing_a_triangle/01_Presentation/01_Swap_chain.adoc @@ -36,11 +36,7 @@ validation layers to enable. [,c++] ---- std::vector deviceExtensions = { - vk::KHRSwapchainExtensionName, - vk::KHRSpirv14ExtensionName, - vk::KHRSynchronization2ExtensionName, - vk::KHRCreateRenderpass2ExtensionName -}; + vk::KHRSwapchainExtensionName}; ---- It should be noted that the availability of a presentation queue,