From a5ac4999b4dea546a7ef824669ab1809224b6448 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Thu, 4 Mar 2021 16:25:58 -0800
Subject: Refactor `gfx` to surface `CommandBuffer` interface. (#1735)

* Refactor `gfx` to surface `CommandBuffer` interface.

* Fixes.

* Fix code review issues, and make vulkan runnable on devices without VK_EXT_extended_dynamic_states.

* Update solution files

* Move out-of-date examples to examples/experimental

Co-authored-by: Yong He <yhe@nvidia.com>
---
 build/visual-studio/gfx/gfx.vcxproj                       |  5 +++++
 build/visual-studio/gfx/gfx.vcxproj.filters               | 15 +++++++++++++++
 .../render-test-tool/render-test-tool.vcxproj             |  5 -----
 .../render-test-tool/render-test-tool.vcxproj.filters     | 15 ---------------
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj
index 0968e8c6c..03c2bb427 100644
--- a/build/visual-studio/gfx/gfx.vcxproj
+++ b/build/visual-studio/gfx/gfx.vcxproj
@@ -180,6 +180,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\slang-gfx.h" />
+    <ClInclude Include="..\..\..\tools\gfx\command-writer.h" />
     <ClInclude Include="..\..\..\tools\gfx\cuda\render-cuda.h" />
     <ClInclude Include="..\..\..\tools\gfx\d3d\d3d-util.h" />
     <ClInclude Include="..\..\..\tools\gfx\d3d11\render-d3d11.h" />
@@ -188,11 +189,13 @@
     <ClInclude Include="..\..\..\tools\gfx\d3d12\render-d3d12.h" />
     <ClInclude Include="..\..\..\tools\gfx\d3d12\resource-d3d12.h" />
     <ClInclude Include="..\..\..\tools\gfx\flag-combiner.h" />
+    <ClInclude Include="..\..\..\tools\gfx\immediate-renderer-base.h" />
     <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-include.h" />
     <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-util.h" />
     <ClInclude Include="..\..\..\tools\gfx\open-gl\render-gl.h" />
     <ClInclude Include="..\..\..\tools\gfx\render-graphics-common.h" />
     <ClInclude Include="..\..\..\tools\gfx\renderer-shared.h" />
+    <ClInclude Include="..\..\..\tools\gfx\simple-render-pass-layout.h" />
     <ClInclude Include="..\..\..\tools\gfx\slang-context.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\render-vk.h" />
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-api.h" />
@@ -211,11 +214,13 @@
     <ClCompile Include="..\..\..\tools\gfx\d3d12\render-d3d12.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\d3d12\resource-d3d12.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\flag-combiner.cpp" />
+    <ClCompile Include="..\..\..\tools\gfx\immediate-renderer-base.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\nvapi\nvapi-util.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\open-gl\render-gl.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\render-graphics-common.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\render.cpp" />
     <ClCompile Include="..\..\..\tools\gfx\renderer-shared.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-descriptor-allocator.cpp" />
diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters
index 1dc6581d6..10445aaf3 100644
--- a/build/visual-studio/gfx/gfx.vcxproj.filters
+++ b/build/visual-studio/gfx/gfx.vcxproj.filters
@@ -12,6 +12,9 @@
     <ClInclude Include="..\..\..\slang-gfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\command-writer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\tools\gfx\cuda\render-cuda.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -36,6 +39,9 @@
     <ClInclude Include="..\..\..\tools\gfx\flag-combiner.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\immediate-renderer-base.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\tools\gfx\nvapi\nvapi-include.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -51,6 +57,9 @@
     <ClInclude Include="..\..\..\tools\gfx\renderer-shared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\simple-render-pass-layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\tools\gfx\slang-context.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -101,6 +110,9 @@
     <ClCompile Include="..\..\..\tools\gfx\flag-combiner.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\tools\gfx\immediate-renderer-base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\tools\gfx\nvapi\nvapi-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -116,6 +128,9 @@
     <ClCompile Include="..\..\..\tools\gfx\renderer-shared.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <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>
diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj b/build/visual-studio/render-test-tool/render-test-tool.vcxproj
index e74392972..0ce5b5361 100644
--- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj
+++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj
@@ -186,8 +186,6 @@
     <ClInclude Include="..\..\..\tools\render-test\shader-input-layout.h" />
     <ClInclude Include="..\..\..\tools\render-test\shader-renderer-util.h" />
     <ClInclude Include="..\..\..\tools\render-test\slang-support.h" />
-    <ClInclude Include="..\..\..\tools\render-test\surface.h" />
-    <ClInclude Include="..\..\..\tools\render-test\window.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\tools\render-test\bind-location.cpp" />
@@ -198,9 +196,6 @@
     <ClCompile Include="..\..\..\tools\render-test\shader-input-layout.cpp" />
     <ClCompile Include="..\..\..\tools\render-test\shader-renderer-util.cpp" />
     <ClCompile Include="..\..\..\tools\render-test\slang-support.cpp" />
-    <ClCompile Include="..\..\..\tools\render-test\surface.cpp" />
-    <ClCompile Include="..\..\..\tools\render-test\window.cpp" />
-    <ClCompile Include="..\..\..\tools\render-test\windows\win-window.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\core\core.vcxproj">
diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters b/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters
index 5223edb08..cfbfa390e 100644
--- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters
+++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters
@@ -30,12 +30,6 @@
     <ClInclude Include="..\..\..\tools\render-test\slang-support.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\render-test\surface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\tools\render-test\window.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\tools\render-test\bind-location.cpp">
@@ -62,14 +56,5 @@
     <ClCompile Include="..\..\..\tools\render-test\slang-support.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\render-test\surface.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\tools\render-test\window.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\tools\render-test\windows\win-window.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3