diff --git a/config/visual-studio/renderer.vcxproj b/config/visual-studio/renderer.vcxproj index 5caaca5..0189709 100644 --- a/config/visual-studio/renderer.vcxproj +++ b/config/visual-studio/renderer.vcxproj @@ -128,7 +128,7 @@ - + @@ -136,9 +136,8 @@ - + - diff --git a/config/visual-studio/renderer.vcxproj.filters b/config/visual-studio/renderer.vcxproj.filters index 38e1409..d43d12e 100644 --- a/config/visual-studio/renderer.vcxproj.filters +++ b/config/visual-studio/renderer.vcxproj.filters @@ -98,10 +98,10 @@ Source Files - + Source Files - + Source Files @@ -142,19 +142,16 @@ Source Files - - Source Files - Source Files Source Files - + Source Files - + Source Files diff --git a/src/engine/renderer/tr_backend.c b/src/engine/renderer/tr_backend.c index 8103ec4..1a0a2d7 100644 --- a/src/engine/renderer/tr_backend.c +++ b/src/engine/renderer/tr_backend.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "tr_local.h" // VULKAN -#include "vk_init.h" +#include "vk.h" #include "vk_demo.h" #include "vk_utils.h" diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h index 7ce863e..1e439af 100644 --- a/src/engine/renderer/tr_local.h +++ b/src/engine/renderer/tr_local.h @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "qgl.h" // VULKAN -#include "vk_definitions.h" +#include "vk.h" #define GL_INDEX_TYPE GL_UNSIGNED_INT typedef unsigned int glIndex_t; diff --git a/src/engine/renderer/vk_init.cpp b/src/engine/renderer/vk.cpp similarity index 99% rename from src/engine/renderer/vk_init.cpp rename to src/engine/renderer/vk.cpp index 1e08f91..a4f04a8 100644 --- a/src/engine/renderer/vk_init.cpp +++ b/src/engine/renderer/vk.cpp @@ -1,4 +1,4 @@ -#include "vk_init.h" +#include "vk.h" #include "vk_utils.h" #define SDL_MAIN_HANDLED diff --git a/src/engine/renderer/vk_init.h b/src/engine/renderer/vk.h similarity index 79% rename from src/engine/renderer/vk_init.h rename to src/engine/renderer/vk.h index ddc986a..e4552eb 100644 --- a/src/engine/renderer/vk_init.h +++ b/src/engine/renderer/vk.h @@ -1,6 +1,12 @@ #pragma once -#include "vk_definitions.h" +#ifdef _WIN32 +#define VK_USE_PLATFORM_WIN32_KHR +#define NOMINMAX +#endif + +#include "vulkan/vulkan.h" + #include struct SDL_SysWMinfo; diff --git a/src/engine/renderer/vk_allocator.h b/src/engine/renderer/vk_allocator.h index 52039b7..eaf1c16 100644 --- a/src/engine/renderer/vk_allocator.h +++ b/src/engine/renderer/vk_allocator.h @@ -1,6 +1,6 @@ #pragma once -#include "vk_definitions.h" +#include "vk.h" #include class Shared_Staging_Memory { diff --git a/src/engine/renderer/vk_definitions.h b/src/engine/renderer/vk_definitions.h deleted file mode 100644 index a329f69..0000000 --- a/src/engine/renderer/vk_definitions.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#define VK_USE_PLATFORM_WIN32_KHR -#define NOMINMAX - -#include "vulkan/vulkan.h" diff --git a/src/engine/renderer/vk_demo.cpp b/src/engine/renderer/vk_demo.cpp index 33126fb..725db62 100644 --- a/src/engine/renderer/vk_demo.cpp +++ b/src/engine/renderer/vk_demo.cpp @@ -1,7 +1,7 @@ #include "vk_allocator.h" #include "vk_resource_manager.h" #include "vk_demo.h" -#include "vk_init.h" +#include "vk.h" #include "vk_utils.h" #include "stb_image.h" diff --git a/src/engine/renderer/vk_demo.h b/src/engine/renderer/vk_demo.h index 0f6679c..a8fe29f 100644 --- a/src/engine/renderer/vk_demo.h +++ b/src/engine/renderer/vk_demo.h @@ -2,7 +2,7 @@ #include #include -#include "vk_definitions.h" +#include "vk.h" struct SDL_SysWMinfo; diff --git a/src/engine/renderer/vk_utils.cpp b/src/engine/renderer/vk_utils.cpp index 37cbf0c..152a49c 100644 --- a/src/engine/renderer/vk_utils.cpp +++ b/src/engine/renderer/vk_utils.cpp @@ -1,6 +1,6 @@ #include "vk_allocator.h" #include "vk_resource_manager.h" -#include "vk_init.h" +#include "vk.h" #include "vk_utils.h" #include #include diff --git a/src/engine/renderer/vk_utils.h b/src/engine/renderer/vk_utils.h index 7f5bc71..0d1d6ca 100644 --- a/src/engine/renderer/vk_utils.h +++ b/src/engine/renderer/vk_utils.h @@ -1,6 +1,6 @@ #pragma once -#include "vk_definitions.h" +#include "vk.h" #include #include