From 5dd27a26da9b6b6191f3b1eba0f38f85714c1ae3 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Wed, 17 Apr 2024 22:14:34 -0700
Subject: Support combined texture sampler when targeting HLSL. (#3963)

* Support combined texture sampler when targeting HLSL.

* Fix glsl intrinsics.

* Update source/slang/slang-ir-lower-combined-texture-sampler.cpp

Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com>

* Update source/slang/slang-ir-lower-combined-texture-sampler.cpp

Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com>

* Update source/slang/slang-ir-lower-combined-texture-sampler.cpp

Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com>

* Fix.,

* Enhance test.

* Remove unused field.

* Fix indentation

---------

Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com>
---
 build/visual-studio/slang/slang.vcxproj         | 2 ++
 build/visual-studio/slang/slang.vcxproj.filters | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'build/visual-studio')

diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj
index f2d470d93..cfb7d474f 100644
--- a/build/visual-studio/slang/slang.vcxproj
+++ b/build/visual-studio/slang/slang.vcxproj
@@ -424,6 +424,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-bit-cast.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-buffer-element-type.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-com-methods.h" />
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-combined-texture-sampler.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-error-handling.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-existential.h" />
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-generic-call.h" />
@@ -652,6 +653,7 @@ IF EXIST ..\..\..\external\slang-glslang\bin\windows-aarch64\release\slang-glsla
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-bit-cast.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-buffer-element-type.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-com-methods.cpp" />
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-combined-texture-sampler.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-error-handling.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-existential.cpp" />
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-generic-call.cpp" />
diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters
index ab06900ba..14559ce5c 100644
--- a/build/visual-studio/slang/slang.vcxproj.filters
+++ b/build/visual-studio/slang/slang.vcxproj.filters
@@ -360,6 +360,9 @@
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-com-methods.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\source\slang\slang-ir-lower-combined-texture-sampler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\source\slang\slang-ir-lower-error-handling.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1040,6 +1043,9 @@
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-com-methods.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\source\slang\slang-ir-lower-combined-texture-sampler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\source\slang\slang-ir-lower-error-handling.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-- 
cgit v1.2.3