Skip to content

Minor cleanup on swapchain creation #117

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
gpx1000 merged 2 commits into from
Aug 21, 2025
Merged

Minor cleanup on swapchain creation #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
399bade
Minor cleanup on swapchain creation
asuessenbach Jul 31, 2025
9e43862
Carried changes over to all chapters.
asuessenbach Aug 18, 2025
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
62 changes: 36 additions & 26 deletions attachments/06_swap_chain_creation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <assert.h>
#include <iostream>
#include <stdexcept>
#include <vector>
Expand Down Expand Up @@ -49,11 +50,10 @@ class HelloTriangleApplication {
vk::raii::PhysicalDevice physicalDevice = nullptr;
vk::raii::Device device = nullptr;
vk::raii::Queue queue = nullptr;

vk::raii::SwapchainKHR swapChain = nullptr;
std::vector<vk::Image> swapChainImages;
vk::Format swapChainImageFormat = vk::Format::eUndefined;
vk::Extent2D swapChainExtent;
vk::raii::SwapchainKHR swapChain = nullptr;
std::vector<vk::Image> swapChainImages;
vk::SurfaceFormatKHR swapChainSurfaceFormat;
vk::Extent2D swapChainExtent;
std::vector<vk::raii::ImageView> swapChainImageViews;

std::vector<const char*> requiredDeviceExtension = {
Expand Down Expand Up @@ -245,40 +245,50 @@ class HelloTriangleApplication {
}

void createSwapChain() {
auto surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( surface );
swapChainImageFormat = chooseSwapSurfaceFormat(physicalDevice.getSurfaceFormatsKHR( surface ));
swapChainExtent = chooseSwapExtent(surfaceCapabilities);
auto minImageCount = std::max( 3u, surfaceCapabilities.minImageCount );
minImageCount = ( surfaceCapabilities.maxImageCount > 0 && minImageCount > surfaceCapabilities.maxImageCount ) ? surfaceCapabilities.maxImageCount : minImageCount;
vk::SwapchainCreateInfoKHR swapChainCreateInfo{
.surface = surface, .minImageCount = minImageCount,
.imageFormat = swapChainImageFormat, .imageColorSpace = vk::ColorSpaceKHR::eSrgbNonlinear,
.imageExtent = swapChainExtent, .imageArrayLayers =1,
.imageUsage = vk::ImageUsageFlagBits::eColorAttachment, .imageSharingMode = vk::SharingMode::eExclusive,
.preTransform = surfaceCapabilities.currentTransform, .compositeAlpha = vk::CompositeAlphaFlagBitsKHR::eOpaque,
.presentMode = chooseSwapPresentMode(physicalDevice.getSurfacePresentModesKHR( surface )),
.clipped = true };
auto surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( *surface );
swapChainExtent = chooseSwapExtent( surfaceCapabilities );
swapChainSurfaceFormat = chooseSwapSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surface ) );
vk::SwapchainCreateInfoKHR swapChainCreateInfo{ .surface = *surface,
.minImageCount = chooseSwapMinImageCount( surfaceCapabilities ),
.imageFormat = swapChainSurfaceFormat.format,
.imageColorSpace = swapChainSurfaceFormat.colorSpace,
.imageExtent = swapChainExtent,
.imageArrayLayers = 1,
.imageUsage = vk::ImageUsageFlagBits::eColorAttachment,
.imageSharingMode = vk::SharingMode::eExclusive,
.preTransform = surfaceCapabilities.currentTransform,
.compositeAlpha = vk::CompositeAlphaFlagBitsKHR::eOpaque,
.presentMode = chooseSwapPresentMode( physicalDevice.getSurfacePresentModesKHR( *surface ) ),
.clipped = true };

swapChain = vk::raii::SwapchainKHR( device, swapChainCreateInfo );
swapChainImages = swapChain.getImages();
}

static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
const auto formatIt = std::ranges::find_if(availableFormats,
[](const auto& format) {
return format.format == vk::Format::eB8G8R8A8Srgb &&
format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
});
return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
static uint32_t chooseSwapMinImageCount(vk::SurfaceCapabilitiesKHR const & surfaceCapabilities) {
auto minImageCount = std::max( 3u, surfaceCapabilities.minImageCount );
if ((0 < surfaceCapabilities.maxImageCount) && (surfaceCapabilities.maxImageCount < minImageCount)) {
minImageCount = surfaceCapabilities.maxImageCount;
}
return minImageCount;
}

static vk::SurfaceFormatKHR chooseSwapSurfaceFormat(std::vector<vk::SurfaceFormatKHR> const & availableFormats) {
assert(!availableFormats.empty());
const auto formatIt = std::ranges::find_if(
availableFormats,
[]( const auto & format ) { return format.format == vk::Format::eB8G8R8A8Srgb && format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear; } );
return formatIt != availableFormats.end() ? *formatIt : availableFormats[0];
}

static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
assert(std::ranges::any_of(availablePresentModes, [](auto presentMode){ return presentMode == vk::PresentModeKHR::eFifo; }));
return std::ranges::any_of(availablePresentModes,
[](const vk::PresentModeKHR value) { return vk::PresentModeKHR::eMailbox == value; } ) ? vk::PresentModeKHR::eMailbox : vk::PresentModeKHR::eFifo;
}

vk::Extent2D chooseSwapExtent(const vk::SurfaceCapabilitiesKHR& capabilities) {
if (capabilities.currentExtent.width != std::numeric_limits<uint32_t>::max()) {
if (capabilities.currentExtent.width != 0xFFFFFFFF) {
return capabilities.currentExtent;
}
int width, height;
Expand Down
64 changes: 37 additions & 27 deletions attachments/07_image_views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <memory>
#include <algorithm>
#include <limits>
#include <assert.h>

#ifdef __INTELLISENSE__
#include <vulkan/vulkan_raii.hpp>
Expand Down Expand Up @@ -49,11 +50,10 @@ class HelloTriangleApplication {
vk::raii::PhysicalDevice physicalDevice = nullptr;
vk::raii::Device device = nullptr;
vk::raii::Queue queue = nullptr;

vk::raii::SwapchainKHR swapChain = nullptr;
std::vector<vk::Image> swapChainImages;
vk::Format swapChainImageFormat = vk::Format::eUndefined;
vk::Extent2D swapChainExtent;
vk::raii::SwapchainKHR swapChain = nullptr;
std::vector<vk::Image> swapChainImages;
vk::SurfaceFormatKHR swapChainSurfaceFormat;
vk::Extent2D swapChainExtent;
std::vector<vk::raii::ImageView> swapChainImageViews;

std::vector<const char*> requiredDeviceExtension = {
Expand Down Expand Up @@ -246,19 +246,21 @@ class HelloTriangleApplication {
}

void createSwapChain() {
auto surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( surface );
swapChainImageFormat = chooseSwapSurfaceFormat(physicalDevice.getSurfaceFormatsKHR( surface ));
swapChainExtent = chooseSwapExtent(surfaceCapabilities);
auto minImageCount = std::max( 3u, surfaceCapabilities.minImageCount );
minImageCount = ( surfaceCapabilities.maxImageCount > 0 && minImageCount > surfaceCapabilities.maxImageCount ) ? surfaceCapabilities.maxImageCount : minImageCount;
vk::SwapchainCreateInfoKHR swapChainCreateInfo{
.surface = surface, .minImageCount = minImageCount,
.imageFormat = swapChainImageFormat, .imageColorSpace = vk::ColorSpaceKHR::eSrgbNonlinear,
.imageExtent = swapChainExtent, .imageArrayLayers =1,
.imageUsage = vk::ImageUsageFlagBits::eColorAttachment, .imageSharingMode = vk::SharingMode::eExclusive,
.preTransform = surfaceCapabilities.currentTransform, .compositeAlpha = vk::CompositeAlphaFlagBitsKHR::eOpaque,
.presentMode = chooseSwapPresentMode(physicalDevice.getSurfacePresentModesKHR( surface )),
.clipped = true };
auto surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( *surface );
swapChainExtent = chooseSwapExtent( surfaceCapabilities );
swapChainSurfaceFormat = chooseSwapSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surface ) );
vk::SwapchainCreateInfoKHR swapChainCreateInfo{ .surface = *surface,
.minImageCount = chooseSwapMinImageCount( surfaceCapabilities ),
.imageFormat = swapChainSurfaceFormat.format,
.imageColorSpace = swapChainSurfaceFormat.colorSpace,
.imageExtent = swapChainExtent,
.imageArrayLayers = 1,
.imageUsage = vk::ImageUsageFlagBits::eColorAttachment,
.imageSharingMode = vk::SharingMode::eExclusive,
.preTransform = surfaceCapabilities.currentTransform,
.compositeAlpha = vk::CompositeAlphaFlagBitsKHR::eOpaque,
.presentMode = chooseSwapPresentMode( physicalDevice.getSurfacePresentModesKHR( *surface ) ),
.clipped = true };

swapChain = vk::raii::SwapchainKHR( device, swapChainCreateInfo );
swapChainImages = swapChain.getImages();
Expand All @@ -267,7 +269,7 @@ class HelloTriangleApplication {
void createImageViews() {
swapChainImageViews.clear();

vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainImageFormat,
vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
for ( auto image : swapChainImages )
{
Expand All @@ -276,22 +278,30 @@ class HelloTriangleApplication {
}
}

static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
const auto formatIt = std::ranges::find_if(availableFormats,
[](const auto& format) {
return format.format == vk::Format::eB8G8R8A8Srgb &&
format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
});
return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
static uint32_t chooseSwapMinImageCount(vk::SurfaceCapabilitiesKHR const & surfaceCapabilities) {
auto minImageCount = std::max( 3u, surfaceCapabilities.minImageCount );
if ((0 < surfaceCapabilities.maxImageCount) && (surfaceCapabilities.maxImageCount < minImageCount)) {
minImageCount = surfaceCapabilities.maxImageCount;
}
return minImageCount;
}

static vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
assert(!availableFormats.empty());
const auto formatIt = std::ranges::find_if(
availableFormats,
[]( const auto & format ) { return format.format == vk::Format::eB8G8R8A8Srgb && format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear; } );
return formatIt != availableFormats.end() ? *formatIt : availableFormats[0];
}

static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
assert(std::ranges::any_of(availablePresentModes, [](auto presentMode){ return presentMode == vk::PresentModeKHR::eFifo; }));
return std::ranges::any_of(availablePresentModes,
[](const vk::PresentModeKHR value) { return vk::PresentModeKHR::eMailbox == value; } ) ? vk::PresentModeKHR::eMailbox : vk::PresentModeKHR::eFifo;
}

vk::Extent2D chooseSwapExtent(const vk::SurfaceCapabilitiesKHR& capabilities) {
if (capabilities.currentExtent.width != std::numeric_limits<uint32_t>::max()) {
if (capabilities.currentExtent.width != 0xFFFFFFFF) {
return capabilities.currentExtent;
}
int width, height;
Expand Down
64 changes: 37 additions & 27 deletions attachments/08_graphics_pipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <memory>
#include <algorithm>
#include <limits>
#include <assert.h>

#ifdef __INTELLISENSE__
#include <vulkan/vulkan_raii.hpp>
Expand Down Expand Up @@ -49,11 +50,10 @@ class HelloTriangleApplication {
vk::raii::PhysicalDevice physicalDevice = nullptr;
vk::raii::Device device = nullptr;
vk::raii::Queue queue = nullptr;

vk::raii::SwapchainKHR swapChain = nullptr;
std::vector<vk::Image> swapChainImages;
vk::Format swapChainImageFormat = vk::Format::eUndefined;
vk::Extent2D swapChainExtent;
vk::raii::SwapchainKHR swapChain = nullptr;
std::vector<vk::Image> swapChainImages;
vk::SurfaceFormatKHR swapChainSurfaceFormat;
vk::Extent2D swapChainExtent;
std::vector<vk::raii::ImageView> swapChainImageViews;

std::vector<const char*> requiredDeviceExtension = {
Expand Down Expand Up @@ -247,19 +247,21 @@ class HelloTriangleApplication {
}

void createSwapChain() {
auto surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( surface );
swapChainImageFormat = chooseSwapSurfaceFormat(physicalDevice.getSurfaceFormatsKHR( surface ));
swapChainExtent = chooseSwapExtent(surfaceCapabilities);
auto minImageCount = std::max( 3u, surfaceCapabilities.minImageCount );
minImageCount = ( surfaceCapabilities.maxImageCount > 0 && minImageCount > surfaceCapabilities.maxImageCount ) ? surfaceCapabilities.maxImageCount : minImageCount;
vk::SwapchainCreateInfoKHR swapChainCreateInfo{
.surface = surface, .minImageCount = minImageCount,
.imageFormat = swapChainImageFormat, .imageColorSpace = vk::ColorSpaceKHR::eSrgbNonlinear,
.imageExtent = swapChainExtent, .imageArrayLayers =1,
.imageUsage = vk::ImageUsageFlagBits::eColorAttachment, .imageSharingMode = vk::SharingMode::eExclusive,
.preTransform = surfaceCapabilities.currentTransform, .compositeAlpha = vk::CompositeAlphaFlagBitsKHR::eOpaque,
.presentMode = chooseSwapPresentMode(physicalDevice.getSurfacePresentModesKHR( surface )),
.clipped = true };
auto surfaceCapabilities = physicalDevice.getSurfaceCapabilitiesKHR( *surface );
swapChainExtent = chooseSwapExtent( surfaceCapabilities );
swapChainSurfaceFormat = chooseSwapSurfaceFormat( physicalDevice.getSurfaceFormatsKHR( *surface ) );
vk::SwapchainCreateInfoKHR swapChainCreateInfo{ .surface = *surface,
.minImageCount = chooseSwapMinImageCount( surfaceCapabilities ),
.imageFormat = swapChainSurfaceFormat.format,
.imageColorSpace = swapChainSurfaceFormat.colorSpace,
.imageExtent = swapChainExtent,
.imageArrayLayers = 1,
.imageUsage = vk::ImageUsageFlagBits::eColorAttachment,
.imageSharingMode = vk::SharingMode::eExclusive,
.preTransform = surfaceCapabilities.currentTransform,
.compositeAlpha = vk::CompositeAlphaFlagBitsKHR::eOpaque,
.presentMode = chooseSwapPresentMode( physicalDevice.getSurfacePresentModesKHR( *surface ) ),
.clipped = true };

swapChain = vk::raii::SwapchainKHR( device, swapChainCreateInfo );
swapChainImages = swapChain.getImages();
Expand All @@ -268,7 +270,7 @@ class HelloTriangleApplication {
void createImageViews() {
swapChainImageViews.clear();

vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainImageFormat,
vk::ImageViewCreateInfo imageViewCreateInfo{ .viewType = vk::ImageViewType::e2D, .format = swapChainSurfaceFormat.format,
.subresourceRange = { vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 } };
for ( auto image : swapChainImages )
{
Expand All @@ -281,22 +283,30 @@ class HelloTriangleApplication {

}

static vk::Format chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
const auto formatIt = std::ranges::find_if(availableFormats,
[](const auto& format) {
return format.format == vk::Format::eB8G8R8A8Srgb &&
format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear;
});
return formatIt != availableFormats.end() ? formatIt->format : availableFormats[0].format;
static uint32_t chooseSwapMinImageCount(vk::SurfaceCapabilitiesKHR const & surfaceCapabilities) {
auto minImageCount = std::max( 3u, surfaceCapabilities.minImageCount );
if ((0 < surfaceCapabilities.maxImageCount) && (surfaceCapabilities.maxImageCount < minImageCount)) {
minImageCount = surfaceCapabilities.maxImageCount;
}
return minImageCount;
}

static vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats) {
assert(!availableFormats.empty());
const auto formatIt = std::ranges::find_if(
availableFormats,
[]( const auto & format ) { return format.format == vk::Format::eB8G8R8A8Srgb && format.colorSpace == vk::ColorSpaceKHR::eSrgbNonlinear; } );
return formatIt != availableFormats.end() ? *formatIt : availableFormats[0];
}

static vk::PresentModeKHR chooseSwapPresentMode(const std::vector<vk::PresentModeKHR>& availablePresentModes) {
assert(std::ranges::any_of(availablePresentModes, [](auto presentMode){ return presentMode == vk::PresentModeKHR::eFifo; }));
return std::ranges::any_of(availablePresentModes,
[](const vk::PresentModeKHR value) { return vk::PresentModeKHR::eMailbox == value; } ) ? vk::PresentModeKHR::eMailbox : vk::PresentModeKHR::eFifo;
}

vk::Extent2D chooseSwapExtent(const vk::SurfaceCapabilitiesKHR& capabilities) {
if (capabilities.currentExtent.width != std::numeric_limits<uint32_t>::max()) {
if (capabilities.currentExtent.width != 0xFFFFFFFF) {
return capabilities.currentExtent;
}
int width, height;
Expand Down
Loading
Loading