Starting point 3

CMakeLists.txt

@@ -1,14 +1,14 @@
 # CMakeList.txt : CMake project for vulkan_guide, include source and define
 # project specific logic here.
 #
-cmake_minimum_required (VERSION 3.8)
+cmake_minimum_required (VERSION 3.11)
 
 project ("vulkan_guide")
 
 
 find_package(Vulkan REQUIRED)
 
-add_subdirectory(third_party)
+add_subdirectory(vendor)
 
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
@@ -18,8 +18,6 @@ add_subdirectory(src)
 find_program(GLSL_VALIDATOR glslangValidator HINTS /usr/bin /usr/local/bin $ENV{VULKAN_SDK}/Bin/ $ENV{VULKAN_SDK}/Bin32/)
 
 
-
-
 file(GLOB_RECURSE GLSL_SOURCE_FILES
     "${PROJECT_SOURCE_DIR}/shaders/*.frag"
     "${PROJECT_SOURCE_DIR}/shaders/*.vert"

README.md

@@ -0,0 +1 @@
+Updated libraries and respective CMakeLists.txt to their modern versions, vendoring them using git subtree. Major library change includes the use of SDL3 rather than SDL2, this will create some differences when following the tutorial. It's recommended to reference the [SDL3 Wiki](https://wiki.libsdl.org/SDL3/FrontPage).

src/CMakeLists.txt

@@ -23,7 +23,8 @@ set_property(TARGET engine PROPERTY CXX_STANDARD 20)
 target_compile_definitions(engine PUBLIC GLM_FORCE_DEPTH_ZERO_TO_ONE)
 target_include_directories(engine PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-target_link_libraries(engine PUBLIC vma glm Vulkan::Vulkan fmt::fmt stb_image SDL2::SDL2 vkbootstrap imgui fastgltf::fastgltf)
+target_link_libraries(engine PRIVATE vk-bootstrap::vk-bootstrap ${CMAKE_DL_LIBS})  # Required for vk-bootstrap to properly link to dynamic libraries on linux.
+target_link_libraries(engine PUBLIC  glm Vulkan::Vulkan GPUOpen::VulkanMemoryAllocator fmt::fmt stb SDL3::SDL3 imgui fastgltf::fastgltf)
 
 target_precompile_headers(engine PUBLIC <optional> <vector> <memory> <string> <vector> <unordered_map> <glm/mat4x4.hpp>  <glm/vec4.hpp> <vulkan/vulkan.h>)
 

src/vk_engine.cpp

@@ -1,8 +1,9 @@
 //> includes
 #include "vk_engine.h"
+#include "SDL3/SDL_events.h"
 
-#include <SDL.h>
-#include <SDL_vulkan.h>
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_vulkan.h>
 
 #include <vk_initializers.h>
 #include <vk_types.h>
@@ -26,8 +27,6 @@ void VulkanEngine::init()
 
     _window = SDL_CreateWindow(
         "Vulkan Engine",
-        SDL_WINDOWPOS_UNDEFINED,
-        SDL_WINDOWPOS_UNDEFINED,
         _windowExtent.width,
         _windowExtent.height,
         window_flags);
@@ -62,16 +61,14 @@ void VulkanEngine::run()
         // Handle events on queue
         while (SDL_PollEvent(&e) != 0) {
             // close the window when user alt-f4s or clicks the X button
-            if (e.type == SDL_QUIT)
+            if (e.type == SDL_EVENT_QUIT)
                 bQuit = true;
 
-            if (e.type == SDL_WINDOWEVENT) {
-                if (e.window.event == SDL_WINDOWEVENT_MINIMIZED) {
-                    stop_rendering = true;
-                }
-                if (e.window.event == SDL_WINDOWEVENT_RESTORED) {
-                    stop_rendering = false;
-                }
+            if (e.type == SDL_EVENT_WINDOW_MINIMIZED) {
+                stop_rendering = true;
+            }
+            if (e.type == SDL_EVENT_WINDOW_RESTORED) {
+                stop_rendering = false;
             }
         }
 

src/vk_types.h

@@ -13,7 +13,7 @@
 
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_enum_string_helper.h>
-#include <vk_mem_alloc.h>
+#include <vma/vk_mem_alloc.h>
 
 #include <fmt/core.h>