started work on vk swapchains

Maploop · Mar 1, 2024 · 20c7817 · 20c7817
1 parent 7d1e4bc
commit 20c7817
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,7 @@
     "editor.fontFamily": "Liberation Mono",
     "editor.fontSize": 15,
     "editor.fontWeight": "1",
-    "workbench.editor.showTabs": "single",
+    "workbench.editor.showTabs": "multiple",
     "workbench.colorCustomizations": {
         "editorCursor.foreground": "#ffffff",
         "editor.lineHighlightBackground": "#2e1638"
@@ -21,7 +21,7 @@
     "C_Cpp.vcFormat.space.pointerReferenceAlignment": "left",
     "C_Cpp.clang_format_sortIncludes": false,
     "C_Cpp.vcFormat.indent.namespaceContents": true,
-    "editor.cursorStyle": "line-thin",
+    "editor.cursorStyle": "block",
     "window.zoomLevel": 0,
     "editor.tabCompletion": "on",
     "todohighlight.isEnable": true,
@@ -66,6 +66,11 @@
         "darray.h": "c",
         "input.h": "c",
         "logger.h": "c",
-        "vulkan_types.inl": "c"
+        "vulkan_types.inl": "c",
+        "stdio.h": "c",
+        "string.h": "c",
+        "cmemory.h": "c",
+        "stat.h": "c",
+        "filesystem.h": "c"
     }
 }
diff --git a/bin/engine.dll b/bin/engine.dll
diff --git a/bin/engine.ilk b/bin/engine.ilk
diff --git a/bin/engine.pdb b/bin/engine.pdb
diff --git a/bin/testbed.exe b/bin/testbed.exe
diff --git a/bin/testbed.ilk b/bin/testbed.ilk
diff --git a/bin/testbed.pdb b/bin/testbed.pdb
diff --git a/engine/src/core/logger.c b/engine/src/core/logger.c
@@ -1,18 +1,18 @@
 #include "logger.h"
 #include "asserts.h"
 #include "platform/platform.h"
+#include "core/cstring.h"
 
 // TODO: Temporary
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 
 b8 initialize_logging() {
-    // TODO: Create log file
     return TRUE;
 }
 void shutdown_logging() {
-    // TODO: Perform any cleanups and write queued entries.
+
 }
 
 KAPI void log_output(log_level level, const char* message, ...) {
@@ -37,6 +37,7 @@ KAPI void log_output(log_level level, const char* message, ...) {
     } else {
          platform_console_write(out_message2, level);
     }
+
 }
 
 void report_assertion_failure(const char* expression, const char* message, const char* file, i32 line) {

diff --git a/engine/src/defines.h b/engine/src/defines.h
@@ -43,6 +43,8 @@ STATIC_ASSERT(sizeof(f64) == 8, "Expected f64 to be 8 bytes.");
 
 #define TRUE 1
 #define FALSE 0
+#define false 0
+#define true 1
 
 // Platform detection
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) 

diff --git a/engine/src/renderer/vulkan/vulkan_backend.c b/engine/src/renderer/vulkan/vulkan_backend.c
@@ -133,7 +133,16 @@ b8 vulkan_renderer_backend_initialize(renderer_backend* backend, const char* app
 }
 
 void vulkan_renderer_backend_shutdown(renderer_backend* backend) {
-    CDEBUG("Destroying Vulkan debugger...");
+    CDEBUG("Destroying Vulkan device...");
+    vulkan_device_destroy(&context);
+
+    if (context.surface) {
+        CDEBUG("Destroying Vulkan surface...");
+        vkDestroySurfaceKHR(context.instance, context.surface, context.allocator);
+        context.surface = 0;
+    }
+
+    CDEBUG("Destroying Vulkan debugger...")
     if (context.debug_messenger) {
         PFN_vkDestroyDebugUtilsMessengerEXT func =
             (PFN_vkDestroyDebugUtilsMessengerEXT)vkGetInstanceProcAddr(context.instance, "vkDestroyDebugUtilsMessengerEXT");

diff --git a/engine/src/renderer/vulkan/vulkan_device.c b/engine/src/renderer/vulkan/vulkan_device.c
@@ -62,9 +62,10 @@ b8 vulkan_device_create(vulkan_context* context) {
         queue_create_infos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
         queue_create_infos[i].queueFamilyIndex = indices[i];
         queue_create_infos[i].queueCount = 1;
-        if (indices[i] == context->device.graphics_queue_index) {
-            queue_create_infos[i].queueCount = 2;
-        }
+        // NOTE: Enable this in the future
+        // if (indices[i] == context->device.graphics_queue_index) {
+        //     queue_create_infos[i].queueCount = 2;
+        // }
         queue_create_infos[i].flags = 0;
         queue_create_infos[i].pNext = 0;
         f32 queue_priority = 1.0f;

diff --git a/engine/src/renderer/vulkan/vulkan_swapchain.c b/engine/src/renderer/vulkan/vulkan_swapchain.c
@@ -0,0 +1,21 @@
+#include "vulkan_swapchain.h"
+
+#include "core/logger.h"
+#include "core/cmemory.h"
+#include "vulkan_device.h"
+
+void create(vulkan_context* context, u32 width, u32 height, vulkan_swapchain* swapchain);
+void destroy(vulkan_context* context, vulkan_swapchain* swapchain);
+
+void vulkan_swapchain_create(vulkan_context* context, u32 width, u32 height, vulkan_swapchain* out_swapchain) {
+    create(context, width, height, out_swapchain);
+}
+
+void vulkan_swapchain_recreate(vulkan_context* context, u32 width, u32 height, vulkan_swapchain* out_swapchain) {
+    destroy(context, out_swapchain);
+    create(context, width, height, out_swapchain);
+}
+
+void vulkan_swapchain_destroy(vulkan_context* context, vulkan_swapchain* swapchain) {
+    destroy(context, swapchain);
+}
diff --git a/engine/src/renderer/vulkan/vulkan_swapchain.h b/engine/src/renderer/vulkan/vulkan_swapchain.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "vulkan_types.inl"
+#include "core/asserts.h"
+
+void vulkan_swapchain_create(vulkan_context* context, u32 width, u32 height, vulkan_swapchain* out_swapchain);
+
+void vulkan_swapchain_recreate(vulkan_context* context, u32 width, u32 height, vulkan_swapchain* out_swapchain);
+
+void vulkan_swapchain_destroy(vulkan_context* context, vulkan_swapchain* swapchain);
+
+b8 vulkan_swapchina_acquire_image_next(vulkan_context* context, vulkan_swapchain* swapchain,
+    u64 timeout_ns, VkSemaphore image_available_semaphore, VkFence fence, u32* out_image_index);
+
+void vulkan_swapchain_present(vulkan_context* context, vulkan_swapchain* swapchain, VkQueue graphics_queue, VkQueue present_queue,
+    VkSemaphore render_complete_semaphore, u32 present_image_index);
diff --git a/engine/src/renderer/vulkan/vulkan_types.inl b/engine/src/renderer/vulkan/vulkan_types.inl
@@ -35,6 +35,15 @@ typedef struct vulkan_device {
     VkPhysicalDeviceMemoryProperties memory;
 } vulkan_device;
 
+typedef struct vulkan_swapchain {
+    VkSurfaceFormatKHR* image_format;
+    u8 max_frames_in_flight;
+    VkSwapchainKHR handle;
+    u32 image_count;
+    VkImage* images;
+    VkImageView* views;
+} vulkan_swapchain;
+
 typedef struct vulkan_context {
     VkInstance instance;
     VkAllocationCallbacks* allocator;

diff --git a/testbed/src/entry.c b/testbed/src/entry.c
@@ -10,7 +10,7 @@ b8 create_game(game* out_game) {
     out_game->app_config.start_pos_y = 100;
     out_game->app_config.start_width = 1280;
     out_game->app_config.start_height = 720;
-    out_game->app_config.name = "Cora Engine Gamma TESTBED-A";
+    out_game->app_config.name = "FR Engine Testbed";
 
     out_game->update = game_update;
     out_game->initialize = game_initialize;