Added vk.h/cpp - it is going to be the main vulkan related module in the renderer.

The plan is to remove other vulkan modules copied from the demo project for quick bootstrapping and replace them by more engine specific vulkan code.

config/visual-studio/renderer.vcxproj

@@ -128,7 +128,7 @@
     <ClCompile Include="..\..\src\engine\platform\win_glimp.c" />
     <ClCompile Include="..\..\src\engine\platform\win_qgl.c" />
     <ClCompile Include="..\..\src\engine\renderer\vk_demo.cpp" />
-    <ClCompile Include="..\..\src\engine\renderer\vk_init.cpp" />
+    <ClCompile Include="..\..\src\engine\renderer\vk.cpp" />
     <ClCompile Include="..\..\src\engine\renderer\vk_utils.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -136,9 +136,8 @@
     <ClInclude Include="..\..\src\engine\platform\glw_win.h" />
     <ClInclude Include="..\..\src\engine\renderer\vk_allocator.h" />
     <ClInclude Include="..\..\src\engine\renderer\vk_resource_manager.h" />
-    <ClInclude Include="..\..\src\engine\renderer\vk_definitions.h" />
+    <ClInclude Include="..\..\src\engine\renderer\vk.h" />
     <ClInclude Include="..\..\src\engine\renderer\vk_demo.h" />
-    <ClInclude Include="..\..\src\engine\renderer\vk_init.h" />
     <ClInclude Include="..\..\src\engine\renderer\vk_utils.h" />
     <ClInclude Include="..\..\src\game\q_shared.h" />
     <ClInclude Include="..\..\src\engine\qcommon\qcommon.h" />

config/visual-studio/renderer.vcxproj.filters

@@ -98,10 +98,10 @@
     <ClCompile Include="..\..\src\engine\renderer\vk_allocator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\engine\renderer\vk_init.cpp">
+    <ClCompile Include="..\..\src\engine\renderer\vk_utils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\engine\renderer\vk_utils.cpp">
+    <ClCompile Include="..\..\src\engine\renderer\vk.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -142,19 +142,16 @@
     <ClInclude Include="..\..\src\engine\renderer\vk_resource_manager.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\engine\renderer\vk_definitions.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\engine\renderer\vk_demo.h">
       <Filter>Source Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\engine\renderer\vk_allocator.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\engine\renderer\vk_init.h">
+    <ClInclude Include="..\..\src\engine\renderer\vk_utils.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\engine\renderer\vk_utils.h">
+    <ClInclude Include="..\..\src\engine\renderer\vk.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>

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"
 

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;

src/engine/renderer/vk.cpp

@@ -1,4 +1,4 @@
-#include "vk_init.h"
+#include "vk.h"
 #include "vk_utils.h"
 
 #define SDL_MAIN_HANDLED

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 <vector>
 
 struct SDL_SysWMinfo;

src/engine/renderer/vk_allocator.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "vk_definitions.h"
+#include "vk.h"
 #include <vector>
 
 class Shared_Staging_Memory {

src/engine/renderer/vk_definitions.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#define VK_USE_PLATFORM_WIN32_KHR
-#define NOMINMAX
-
-#include "vulkan/vulkan.h"

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"

src/engine/renderer/vk_demo.h

@@ -2,7 +2,7 @@
 
 #include <memory>
 #include <vector>
-#include "vk_definitions.h"
+#include "vk.h"
 
 struct SDL_SysWMinfo;
 

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 <iostream>
 #include <fstream>

src/engine/renderer/vk_utils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "vk_definitions.h"
+#include "vk.h"
 #include <functional>
 #include <string>