Skip to content

Commit 36a2f2d

Browse files
committed
disp/vulkan: Fix spelling of 'attributes'
1 parent 943ca22 commit 36a2f2d

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

src/video_display/vulkan/vulkan_context.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,11 @@ void VulkanContext::create_logical_device() {
513513
void VulkanContext::create_swap_chain(vk::SwapchainKHR&& old_swapchain) {
514514
constexpr int initialization_attempts = 3;
515515
for (int attempt = 0; attempt < initialization_attempts; attempt++) {
516-
auto& capabilities = swapchain_atributes.capabilities;
516+
auto& capabilities = swapchain_attributes.capabilities;
517517
capabilities = gpu.getSurfaceCapabilitiesKHR(surface);
518518

519-
swapchain_atributes.format = get_surface_format(gpu, surface);
520-
swapchain_atributes.mode = get_present_mode(gpu, surface, preferred_present_mode);
519+
swapchain_attributes.format = get_surface_format(gpu, surface);
520+
swapchain_attributes.mode = get_present_mode(gpu, surface, preferred_present_mode);
521521

522522
vk::Extent2D swapchain_image_size;
523523
swapchain_image_size.width = std::clamp(window_parameters.width,
@@ -526,29 +526,29 @@ void VulkanContext::create_swap_chain(vk::SwapchainKHR&& old_swapchain) {
526526
swapchain_image_size.height = std::clamp(window_parameters.height,
527527
capabilities.minImageExtent.height,
528528
capabilities.maxImageExtent.height);
529-
swapchain_atributes.image_size = swapchain_image_size;
529+
swapchain_attributes.image_size = swapchain_image_size;
530530

531531
uint32_t image_count = std::max(uint32_t{2}, capabilities.minImageCount);
532532
if (capabilities.maxImageCount != 0) {
533533
image_count = std::min(image_count, capabilities.maxImageCount);
534534
}
535535

536-
log_msg(LOG_LEVEL_INFO, MOD_NAME "Recreating swapchain, size: %dx%d, format %s\n", swapchain_image_size.width, swapchain_image_size.height, vk::to_string(swapchain_atributes.format.format).c_str());
536+
log_msg(LOG_LEVEL_INFO, MOD_NAME "Recreating swapchain, size: %dx%d, format %s\n", swapchain_image_size.width, swapchain_image_size.height, vk::to_string(swapchain_attributes.format.format).c_str());
537537

538538
//assert(capabilities.supportedUsageFlags & vk::ImageUsageFlagBits::eTransferDst);
539539
vk::SwapchainCreateInfoKHR swapchain_info{};
540540
swapchain_info
541541
.setSurface(surface)
542-
.setImageFormat(swapchain_atributes.format.format)
543-
.setImageColorSpace(swapchain_atributes.format.colorSpace)
544-
.setPresentMode(swapchain_atributes.mode)
542+
.setImageFormat(swapchain_attributes.format.format)
543+
.setImageColorSpace(swapchain_attributes.format.colorSpace)
544+
.setPresentMode(swapchain_attributes.mode)
545545
.setMinImageCount(image_count)
546546
.setImageExtent(swapchain_image_size)
547547
.setImageArrayLayers(1)
548548
.setImageUsage(vk::ImageUsageFlagBits::eColorAttachment)
549549
.setImageSharingMode(vk::SharingMode::eExclusive)
550-
.setPreTransform(swapchain_atributes.capabilities.currentTransform)
551-
.setCompositeAlpha(get_composite_alpha(swapchain_atributes.capabilities.supportedCompositeAlpha))
550+
.setPreTransform(swapchain_attributes.capabilities.currentTransform)
551+
.setCompositeAlpha(get_composite_alpha(swapchain_attributes.capabilities.supportedCompositeAlpha))
552552
.setClipped(true)
553553
.setOldSwapchain(old_swapchain);
554554
try{
@@ -599,15 +599,15 @@ void VulkanContext::init(vulkan_display::VulkanInstance&& instance, vk::SurfaceK
599599

600600
queue = device.getQueue(queue_family_index, 0);
601601
create_swap_chain();
602-
create_swapchain_views(device, swapchain, swapchain_atributes.format.format, swapchain_images);
602+
create_swapchain_views(device, swapchain, swapchain_attributes.format.format, swapchain_images);
603603
}
604604

605605
void VulkanContext::create_framebuffers(vk::RenderPass render_pass) {
606606
vk::FramebufferCreateInfo framebuffer_info;
607607
framebuffer_info
608608
.setRenderPass(render_pass)
609-
.setWidth(swapchain_atributes.image_size.width)
610-
.setHeight(swapchain_atributes.image_size.height)
609+
.setWidth(swapchain_attributes.image_size.width)
610+
.setHeight(swapchain_attributes.image_size.height)
611611
.setLayers(1);
612612

613613
for(auto& swapchain_image : swapchain_images){
@@ -627,7 +627,7 @@ void VulkanContext::recreate_swapchain(WindowParameters parameters, vk::RenderPa
627627
destroy_swapchain_views();
628628
vk::SwapchainKHR old_swap_chain = swapchain;
629629
create_swap_chain(std::move(old_swap_chain));
630-
create_swapchain_views(device, swapchain, swapchain_atributes.format.format, swapchain_images);
630+
create_swapchain_views(device, swapchain, swapchain_attributes.format.format, swapchain_images);
631631
create_framebuffers(render_pass);
632632
swapchain_was_suboptimal = false;
633633
}

src/video_display/vulkan/vulkan_context.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class VulkanContext {
138138
vk::SurfaceFormatKHR format;
139139
vk::PresentModeKHR mode = vk::PresentModeKHR::eFifo;
140140
vk::Extent2D image_size;
141-
} swapchain_atributes;
141+
} swapchain_attributes;
142142

143143
std::vector<SwapchainImage> swapchain_images{};
144144
vk::PresentModeKHR preferred_present_mode{};
@@ -154,9 +154,9 @@ class VulkanContext {
154154
uint32_t get_queue_family_index() { return queue_family_index; }
155155
vk::Queue get_queue() { return queue; }
156156
vk::SwapchainKHR get_swapchain() { return swapchain; }
157-
vk::Format get_swapchain_image_format() { return swapchain_atributes.format.format; };
157+
vk::Format get_swapchain_image_format() { return swapchain_attributes.format.format; };
158158
size_t get_swapchain_image_count() { return swapchain_images.size(); }
159-
vk::Extent2D get_render_area_size() { return swapchain_atributes.image_size; }
159+
vk::Extent2D get_render_area_size() { return swapchain_attributes.image_size; }
160160
private:
161161
void create_logical_device();
162162

0 commit comments

Comments
 (0)