From 5a3aa6159e0ef0241b528812e1d138f0d7055f22 Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Tue, 17 May 2022 10:56:14 -0700
Subject: Split render-d3d12.h/cpp into a set of smaller files (#2231)

* Split render-d3d12 into numerous smaller files to make the code easier to parse

* Added all new D3D12 files created from splitting render-d3d12

* Fixed several uses of attachment still floating around; Changed resource-d3d12 and descriptor-heap-d3d12 to match naming conventions of new d3d12 implementation header files

* Readded files with name changes because changing them from inside VS apparently results in them being treated as new files

* Merged in externals changes from master

* Small cleanup changes

* Rerun CI

Co-authored-by: Theresa Foley <10618364+tangent-vector@users.noreply.github.com>
---
 build/visual-studio/gfx/gfx.vcxproj         |  53 +++++++++--
 build/visual-studio/gfx/gfx.vcxproj.filters | 143 ++++++++++++++++++++++++++--
 2 files changed, 180 insertions(+), 16 deletions(-)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj
index ca6b365f5..a17310173 100644
--- a/build/visual-studio/gfx/gfx.vcxproj
+++ b/build/visual-studio/gfx/gfx.vcxproj
@@ -304,12 +304,34 @@
     <ClInclude Include="..\..\..\tools\gfx\command-writer.h" />
     <ClInclude Include="..\..\..\tools\gfx\cpu\render-cpu.h" />
     <ClInclude Include="..\..\..\tools\gfx\cuda\render-cuda.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-buffer.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-command-buffer.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-command-encoder.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-command-queue.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-device.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-fence.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-framebuffer.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-base.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-helper-functions.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-query.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-render-pass.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-resource-views.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-sampler.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object-layout.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-program.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-table.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-submitter.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-swap-chain.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-texture.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-transient-heap.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-vertex-layout.h" />
     <ClInclude Include="..\..\..\tools\gfx\d3d\d3d-swapchain.h" />
     <ClInclude Include="..\..\..\tools\gfx\d3d\d3d-util.h" />
     <ClInclude Include="..\..\..\tools\gfx\d3d11\render-d3d11.h" />
-    <ClInclude Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.h" />
-    <ClInclude Include="..\..\..\tools\gfx\d3d12\render-d3d12.h" />
-    <ClInclude Include="..\..\..\tools\gfx\d3d12\resource-d3d12.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-descriptor-heap.h" />
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-resource.h" />
     <ClInclude Include="..\..\..\tools\gfx\debug-layer.h" />
     <ClInclude Include="..\..\..\tools\gfx\flag-combiner.h" />
     <ClInclude Include="..\..\..\tools\gfx\immediate-renderer-base.h" />
@@ -333,12 +355,31 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\tools\gfx\cpu\render-cpu.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\cuda\render-cuda.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-buffer.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-command-buffer.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-command-encoder.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-command-queue.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-device.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-fence.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-helper-functions.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-query.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-render-pass.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-resource-views.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-sampler.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object-layout.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-program.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-table.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-submitter.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-swap-chain.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-texture.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-transient-heap.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\d3d\d3d-swapchain.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\d3d\d3d-util.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\d3d11\render-d3d11.cpp" />
-    <ClCompile Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.cpp" />
-    <ClCompile Include="..\..\..\tools\gfx\d3d12\render-d3d12.cpp" />
-    <ClCompile Include="..\..\..\tools\gfx\d3d12\resource-d3d12.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-descriptor-heap.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-resource.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\debug-layer.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\flag-combiner.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\immediate-renderer-base.cpp" />
diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters
index a6b9aab7f..e509a00a4 100644
--- a/build/visual-studio/gfx/gfx.vcxproj.filters
+++ b/build/visual-studio/gfx/gfx.vcxproj.filters
@@ -33,13 +33,10 @@
     <ClInclude Include="..\..\..\tools\gfx\d3d11\render-d3d11.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.h">
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-descriptor-heap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\d3d12\render-d3d12.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\d3d12\resource-d3d12.h">
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\tools\gfx\debug-layer.h">
@@ -99,6 +96,75 @@
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-texture.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-sampler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-resource-views.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-framebuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-render-pass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-vertex-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-device.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-query.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-transient-heap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-command-encoder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-submitter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-program.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-shader-table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-command-buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-fence.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-command-queue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-swap-chain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-helper-functions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\tools\gfx\cpu\render-cpu.cpp">
@@ -116,13 +182,10 @@
     <ClCompile Include="..\..\..\tools\gfx\d3d11\render-d3d11.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\d3d12\descriptor-heap-d3d12.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-descriptor-heap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\d3d12\render-d3d12.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\d3d12\resource-d3d12.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-resource.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\tools\gfx\debug-layer.cpp">
@@ -170,5 +233,65 @@
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-texture.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-sampler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-resource-views.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-render-pass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-device.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-query.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-transient-heap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-command-encoder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-object-layout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-program.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-shader-table.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-command-buffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-fence.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-command-queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-swap-chain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-helper-functions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-submitter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3