From 43e1b7cdc70b2fcac8a3e8ee72f5bc91726f4ec5 Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Thu, 26 May 2022 10:54:35 -0700
Subject: Split render-vk.h/.cpp into a set of smaller files (#2244)

* Some preliminary work on splitting render-vk

* render-vk split, tests currently crash on null reference

* fixed circular include
---
 build/visual-studio/gfx/gfx.vcxproj         |  44 +++++++++-
 build/visual-studio/gfx/gfx.vcxproj.filters | 132 ++++++++++++++++++++++++++--
 2 files changed, 168 insertions(+), 8 deletions(-)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj
index ae4131d94..5a3ed6887 100644
--- a/build/visual-studio/gfx/gfx.vcxproj
+++ b/build/visual-studio/gfx/gfx.vcxproj
@@ -345,12 +345,33 @@
     <ClInclude Include="..\..\..\tools\gfx\simple-transient-resource-heap.h" />
     <ClInclude Include="..\..\..\tools\gfx\slang-context.h" />
     <ClInclude Include="..\..\..\tools\gfx\transient-resource-heap-base.h" />
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\render-vk.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-api.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-base.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-buffer.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-buffer.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-queue.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-descriptor-allocator.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device-queue.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-fence.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-module.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-pipeline-state.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-query.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-render-pass.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-resource-views.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-sampler.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-program.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-table.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-texture.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-transient-heap.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h" />
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-vertex-layout.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\tools\gfx\cpu\render-cpu.cpp" />
@@ -389,11 +410,30 @@
     <ClCompile Include="..\..\..\tools\gfx\renderer-shared.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\resource-desc-utils.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\simple-render-pass-layout.cpp" />
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\render-vk.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-api.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-buffer.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-buffer.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-queue.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-descriptor-allocator.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device-queue.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-fence.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-module.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-pipeline-state.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-query.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-render-pass.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-resource-views.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-sampler.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-program.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-table.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-texture.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-transient-heap.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters
index b95e127fd..c9544a85f 100644
--- a/build/visual-studio/gfx/gfx.vcxproj.filters
+++ b/build/visual-studio/gfx/gfx.vcxproj.filters
@@ -147,9 +147,6 @@
     <ClInclude Include="..\..\..\tools\gfx\transient-resource-heap-base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\render-vk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-api.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -165,6 +162,72 @@
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-query.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-vertex-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-fence.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-texture.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-sampler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-resource-views.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-render-pass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-pipeline-state.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-program.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-transient-heap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\tools\gfx\cpu\render-cpu.cpp">
@@ -275,9 +338,6 @@
     <ClCompile Include="..\..\..\tools\gfx\simple-render-pass-layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\render-vk.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-api.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -293,5 +353,65 @@
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-query.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-fence.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-texture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-sampler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-resource-views.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-render-pass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-pipeline-state.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-program.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-table.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-transient-heap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3