[Link] Enable to compile HLSLs to Dxil modules, and link them

Related work item: Github #10
microsoft · Apr 24, 2020 · 3abff09 · 3abff09
1 parent f75d8c7
commit 3abff09
Show file tree

Hide file tree

Showing 15 changed files with 802 additions and 74 deletions.
diff --git a/External/googletest.cmake b/External/googletest.cmake
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-set(googletest_REV "440527a61e1c91188195f7de212c63c77e8f0a45")
+set(googletest_REV "dcc92d0ab6c4ce022162a23566d44f673251eee4")
 
 UpdateExternalLib("googletest" "https://github.com/google/googletest.git" ${googletest_REV})
 

diff --git a/Include/ShaderConductor/ShaderConductor.hpp b/Include/ShaderConductor/ShaderConductor.hpp
@@ -164,6 +164,7 @@ namespace ShaderConductor
         {
             ShadingLanguage language;
             const char* version;
+            bool asModule;
         };
 
         struct ResultDesc
@@ -178,15 +179,34 @@ namespace ShaderConductor
         struct DisassembleDesc
         {
             ShadingLanguage language;
-            uint8_t* binary;
+            const uint8_t* binary;
             uint32_t binarySize;
         };
 
+        struct ModuleDesc
+        {
+            const char* name;
+            Blob* target;
+        };
+
+        struct LinkDesc
+        {
+            const char* entryPoint;
+            ShaderStage stage;
+
+            const ModuleDesc** modules;
+            uint32_t numModules;
+        };
+
     public:
         static ResultDesc Compile(const SourceDesc& source, const Options& options, const TargetDesc& target);
         static void Compile(const SourceDesc& source, const Options& options, const TargetDesc* targets, uint32_t numTargets,
                             ResultDesc* results);
         static ResultDesc Disassemble(const DisassembleDesc& source);
+
+        // Currently only Dxil on Windows supports linking
+        static bool LinkSupport();
+        static ResultDesc Link(const LinkDesc& modules, const Options& options, const TargetDesc& target);
     };
 } // namespace ShaderConductor