From c9ef8d58a135061262fd321a82061d27dc733cf5 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Wed, 3 May 2023 20:16:58 -0400
Subject: HLSL->Vulkan binding support (#2865)

* WIP around VK shift binding.

* Refactor around options parsing.

* Remove needless passing around of sink.

* Some more tidying around OptionsParser.

* Handle vulkan shift parsing.

* Fix small issue around vk binding and "all".

* Fixing some small issues. Missing break.

* Split out VulkanLayoutOptions

* WIP binding taking into account HLSL->Vulkan options.

* First attempt at making binding work with HLSLVulkanOptions.

* VulkanLayoutOptions -> HLSLToVulkanLayoutOptions

* WIP with HLSL-Vulkan binding.

* Some more testing around vk-shift.

* Improvements around global binding.
More tests.

* Improve test coverage.
Improve checking for requirements around default space.

* Update command line options.

* Small fixes.

* Small fix in options reporting.

* Fix warning issue.

* Some fixes for isDefault for HLSLToVulkanLayoutOptions.

* Update hlsl-to-vulkan-shift output. The difference was due to default handling if shift isn't specified, and not being specified was not correctly tracked.
---
 build/visual-studio/slang/slang.vcxproj         | 2 ++
 build/visual-studio/slang/slang.vcxproj.filters | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'build')

diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index 7e0348d73..fcc125860 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -344,6 +344,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClInclude Include="..\..\..\source\slang\slang-emit-source-writer.h" />
     <ClInclude Include="..\..\..\source\slang\slang-emit-torch.h" />
     <ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-hlsl-to-vulkan-layout-options.h" />
     <ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h" />
     <ClInclude Include="..\..\..\source\slang\slang-intrinsic-expand.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir-addr-inst-elimination.h" />
@@ -543,6 +544,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClCompile Include="..\..\..\source\slang\slang-emit-torch.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-emit.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-hlsl-to-vulkan-layout-options.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-intrinsic-expand.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-addr-inst-elimination.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-address-analysis.cpp" />
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index cae2199b8..3ff574d10 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -120,6 +120,9 @@
     <ClInclude Include="..\..\..\source\slang\slang-glsl-extension-tracker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-hlsl-to-vulkan-layout-options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-image-format-defs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -713,6 +716,9 @@
     <ClCompile Include="..\..\..\source\slang\slang-glsl-extension-tracker.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-hlsl-to-vulkan-layout-options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-intrinsic-expand.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.3