From fc84455d0d1cb6b9396ba869a17d6f8d4b65ecc6 Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Wed, 1 Jun 2022 14:33:21 -0700
Subject: Vulkan validation error fixes (#2254)

* Fixed Vulkan validation errors for incorrect layer counts and view types in Debug

* Removed old (and empty) render-vk files; Ran premake.bat
---
 build/visual-studio/gfx/gfx.vcxproj.filters | 92 ++++++++++++++---------------
 1 file changed, 46 insertions(+), 46 deletions(-)

(limited to 'build')

diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters
index c9544a85f..b663bf704 100644
--- a/build/visual-studio/gfx/gfx.vcxproj.filters
+++ b/build/visual-studio/gfx/gfx.vcxproj.filters
@@ -150,82 +150,82 @@
     <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-api.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-descriptor-allocator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device-queue.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-module.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-buffer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-buffer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-base.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-descriptor-allocator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-buffer.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device-queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-query.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-device.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-vertex-layout.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-fence.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-fence.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-texture.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-sampler.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-module.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-resource-views.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-pipeline-state.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-query.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">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-resource-views.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-sampler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-program.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-object.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-shader-program.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">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-command-queue.h">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-texture.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">
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\tools\gfx\vulkan\vk-vertex-layout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -341,76 +341,76 @@
     <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-api.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-descriptor-allocator.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-buffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device-queue.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-buffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-module.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-queue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-descriptor-allocator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device-queue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-buffer.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-device.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-query.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-fence.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-fence.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-texture.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-helper-functions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-sampler.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-resource-views.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-pipeline-state.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-framebuffer.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-query.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">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-resource-views.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-sampler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-program.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object-layout.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-encoder.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-object.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-shader-program.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">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-swap-chain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-command-queue.cpp">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-texture.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">
+    <ClCompile Include="..\..\..\tools\gfx\vulkan\vk-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-- 
cgit v1.2.3