From 0d2a2ddde3ed8c449819c72de45a562e731b1c96 Mon Sep 17 00:00:00 2001 From: Piotr Krygier Date: Fri, 29 Aug 2025 14:16:05 +0200 Subject: [PATCH] Fix testing application --- graphics/src/rse_graphics.c | 2 +- graphics/src/vulkan_base.c | 2 +- graphics/src/vulkan_commons.h | 4 ++-- graphics/src/vulkan_swapchain.c | 2 +- graphics/src/window.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics/src/rse_graphics.c b/graphics/src/rse_graphics.c index e9a84125..8e4c5868 100644 --- a/graphics/src/rse_graphics.c +++ b/graphics/src/rse_graphics.c @@ -104,7 +104,7 @@ void rse_graphics_test_function(struct rse_graphics_context_t* rse_context) pipeline_add_shader_stage(context, pipeline, curr_path, VK_SHADER_STAGE_FRAGMENT_BIT); pipeline_add_vertex_input_binding(pipeline, 0, sizeof(struct vertex_t), VK_VERTEX_INPUT_RATE_VERTEX); - pipeline_add_vertex_input_binding(pipeline, 1, sizeof(struct vertex_t), VK_VERTEX_INPUT_RATE_INSTANCE); + pipeline_add_vertex_input_binding(pipeline, 1, sizeof(struct instance_data_t), VK_VERTEX_INPUT_RATE_INSTANCE); pipeline_add_vertex_input_attribute(pipeline, 0, 0, VK_FORMAT_R32G32B32_SFLOAT, offsetof(struct vertex_t, pos)); pipeline_add_vertex_input_attribute(pipeline, 0, 1, VK_FORMAT_R32G32B32_SFLOAT, offsetof(struct vertex_t, color)); diff --git a/graphics/src/vulkan_base.c b/graphics/src/vulkan_base.c index 2b4cf607..7cd7e7d2 100644 --- a/graphics/src/vulkan_base.c +++ b/graphics/src/vulkan_base.c @@ -621,7 +621,7 @@ rse_err_t draw_frame(struct graphics_context_t* context) present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; present_info.waitSemaphoreCount = 1; - present_info.pWaitSemaphores = signal_semaphores; + present_info.pWaitSemaphores = &context->render_finished_semaphores[context->current_frame]; swap_chains[0] = context->swapchain; present_info.swapchainCount = 1; diff --git a/graphics/src/vulkan_commons.h b/graphics/src/vulkan_commons.h index da02a4d7..4a0d1e89 100644 --- a/graphics/src/vulkan_commons.h +++ b/graphics/src/vulkan_commons.h @@ -19,7 +19,7 @@ #include -#define SWAP_BUFFER_COUNT 2U +#define SWAP_BUFFER_COUNT 3U /** * @brief Represents single vertex on the screen @@ -55,7 +55,7 @@ struct instance_data_t { struct vec3_t pos; struct vec3_t rot; float scale; - uint8_t texture_id; + uint32_t texture_id; }; void init_time(); diff --git a/graphics/src/vulkan_swapchain.c b/graphics/src/vulkan_swapchain.c index 1ad18d66..d1f88571 100644 --- a/graphics/src/vulkan_swapchain.c +++ b/graphics/src/vulkan_swapchain.c @@ -41,7 +41,7 @@ static rse_err_t create_swapchain(struct graphics_context_t* context) create_info.pNext = NULL; create_info.flags = 0U; create_info.surface = context->surface; - create_info.minImageCount = SWAP_BUFFER_COUNT + 1; + create_info.minImageCount = SWAP_BUFFER_COUNT; create_info.imageFormat = IMAGE_FORMAT; create_info.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; create_info.imageExtent = context->swapchain_extent; diff --git a/graphics/src/window.c b/graphics/src/window.c index e3bf3ff0..88017184 100644 --- a/graphics/src/window.c +++ b/graphics/src/window.c @@ -27,7 +27,7 @@ rse_err_t window_init(SDL_Window **window_handle, bool *is_framebuffer_resized) { SDL_Init(SDL_INIT_VIDEO); //TODO: Move to initial phase of RSE initialization - *window_handle = SDL_CreateWindow("RedScarfEngine", 640, 480, SDL_WINDOW_VULKAN); + *window_handle = SDL_CreateWindow("RedScarfEngine", 1024, 768, SDL_WINDOW_VULKAN); if (NULL == *window_handle) { LOGF(_("Window context creation failed\n"));