Reanme SWAPCHAIN_IMG_BUFFER_SIZE to MAX_FRAMES_IN_FLIGHT

This commit is contained in:
Camden Dixie O'Brien committed 2025-09-29 17:11:32 +01:00
1 parent e75498ff71
commit 4c6015cbc9
2 files changed
+7 -8

No files matched your search

+3 -4
View File
@@ -8,7 +8,6 @@
#define EXT_PROP_BUFFER_SIZE 256 #define EXT_PROP_BUFFER_SIZE 256
#define SURFACE_FMT_BUFFER_SIZE 64 #define SURFACE_FMT_BUFFER_SIZE 64
#define PRESENT_MODE_BUFFER_SIZE 8 #define PRESENT_MODE_BUFFER_SIZE 8
#define SWAPCHAIN_IMG_BUFFER_SIZE 4
#define NELEMS(arr) (sizeof(arr) / sizeof(arr[0])) #define NELEMS(arr) (sizeof(arr) / sizeof(arr[0]))
@@ -284,7 +283,7 @@ void gpu_init(gpu_ctx_t *ctx, const gpu_config_t *config, model_t model)
// Select image count // Select image count
uint32_t swapchain_img_count = surface_caps.minImageCount + 1; uint32_t swapchain_img_count = surface_caps.minImageCount + 1;
assert(swapchain_img_count <= SWAPCHAIN_IMG_BUFFER_SIZE); assert(swapchain_img_count <= MAX_FRAMES_IN_FLIGHT);
assert( assert(
surface_caps.maxImageCount == 0 surface_caps.maxImageCount == 0
|| swapchain_img_count <= surface_caps.maxImageCount); || swapchain_img_count <= surface_caps.maxImageCount);
@@ -311,8 +310,8 @@ void gpu_init(gpu_ctx_t *ctx, const gpu_config_t *config, model_t model)
assert(result == VK_SUCCESS); assert(result == VK_SUCCESS);
// Retreive swapchain images // Retreive swapchain images
VkImage swapchain_imgs[SWAPCHAIN_IMG_BUFFER_SIZE]; VkImage swapchain_imgs[MAX_FRAMES_IN_FLIGHT];
ctx->swapchain_img_count = SWAPCHAIN_IMG_BUFFER_SIZE; ctx->swapchain_img_count = MAX_FRAMES_IN_FLIGHT;
result = vkGetSwapchainImagesKHR( result = vkGetSwapchainImagesKHR(
ctx->dev, ctx->swapchain, &swapchain_img_count, swapchain_imgs); ctx->dev, ctx->swapchain, &swapchain_img_count, swapchain_imgs);
assert(result == VK_SUCCESS); assert(result == VK_SUCCESS);
+4 -4
View File
@@ -7,7 +7,7 @@
#define GLFW_INCLUDE_VULKAN #define GLFW_INCLUDE_VULKAN
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#define SWAPCHAIN_IMG_BUFFER_SIZE 4 #define MAX_FRAMES_IN_FLIGHT 4
typedef struct { typedef struct {
mat4_t model; mat4_t model;
@@ -24,16 +24,16 @@ typedef struct {
VkSwapchainKHR swapchain; VkSwapchainKHR swapchain;
VkExtent2D swapchain_extent; VkExtent2D swapchain_extent;
uint32_t swapchain_img_count; uint32_t swapchain_img_count;
VkImageView swapchain_img_views[SWAPCHAIN_IMG_BUFFER_SIZE]; VkImageView swapchain_img_views[MAX_FRAMES_IN_FLIGHT];
VkImage depth_img; VkImage depth_img;
VkDeviceMemory depth_img_mem; VkDeviceMemory depth_img_mem;
VkImageView depth_img_view; VkImageView depth_img_view;
VkFramebuffer framebuffers[SWAPCHAIN_IMG_BUFFER_SIZE]; VkFramebuffer framebuffers[MAX_FRAMES_IN_FLIGHT];
VkShaderModule vert_shader; VkShaderModule vert_shader;
VkShaderModule frag_shader; VkShaderModule frag_shader;
VkDescriptorSetLayout desc_set_layout; VkDescriptorSetLayout desc_set_layout;
VkDescriptorPool desc_pool; VkDescriptorPool desc_pool;
VkDescriptorSet desc_sets[SWAPCHAIN_IMG_BUFFER_SIZE]; VkDescriptorSet desc_sets[MAX_FRAMES_IN_FLIGHT];
VkBuffer mvp_buffer; VkBuffer mvp_buffer;
VkDeviceMemory mvp_buffer_mem; VkDeviceMemory mvp_buffer_mem;
mvp_t *mvps; mvp_t *mvps;