Merge https://github.com/shader-slang/slang

Author: csyonghe

external/dxc/dxcapi.h

@@ -89,6 +89,8 @@ extern "C"
         SLANG_SPIRV_ASM,
         SLANG_DXBC,
         SLANG_DXBC_ASM,
+        SLANG_DXIL,
+        SLANG_DXIL_ASM,
     };
 
     /* A "container format" describes the way that the outputs
@@ -1079,6 +1081,7 @@ namespace slang
 #include "source/core/text-io.cpp"
 #include "source/slang/bytecode.cpp"
 #include "source/slang/diagnostics.cpp"
+#include "source/slang/dxc-support.cpp"
 #include "source/slang/emit.cpp"
 #include "source/slang/ir.cpp"
 #include "source/slang/lexer.cpp"

slang.h

@@ -15,7 +15,7 @@
 #include "reflection.h"
 #include "emit.h"
 
-// Enable calling through to `fxc` to
+// Enable calling through to `fxc` or `dxc` to
 // generate code on Windows.
 #ifdef _WIN32
     #define WIN32_LEAN_AND_MEAN
@@ -27,12 +27,18 @@
     #ifndef SLANG_ENABLE_DXBC_SUPPORT
         #define SLANG_ENABLE_DXBC_SUPPORT 1
     #endif
+    #ifndef SLANG_ENABLE_DXIL_SUPPORT
+        #define SLANG_ENABLE_DXIL_SUPPORT 1
+    #endif
 #endif
 //
-// Otherwise, don't enable DXBC by default:
+// Otherwise, don't enable DXBC/DXIL by default:
 #ifndef SLANG_ENABLE_DXBC_SUPPORT
     #define SLANG_ENABLE_DXBC_SUPPORT 0
 #endif
+#ifndef SLANG_ENABLE_DXIL_SUPPORT
+    #define SLANG_ENABLE_DXIL_SUPPORT 0
+#endif
 
 // Enable calling through to `glslang` on
 // all platforms.
@@ -356,6 +362,22 @@ namespace Slang
     }
 #endif
 
+#if SLANG_ENABLE_DXIL_SUPPORT
+
+// Implementations in `dxc-support.cpp`
+
+int emitDXILForEntryPointUsingDXC(
+    EntryPointRequest*  entryPoint,
+    TargetRequest*      targetReq,
+    List<uint8_t>&      outCode);
+
+String dissassembleDXILUsingDXC(
+    CompileRequest*     compileRequest,
+    void const*         data,
+    size_t              size);
+
+#endif
+
 #if SLANG_ENABLE_GLSLANG_SUPPORT
 
     SharedLibrary loadGLSLCompilerDLL(CompileRequest* request)
@@ -540,6 +562,38 @@ namespace Slang
             break;
 #endif
 
+#if SLANG_ENABLE_DXIL_SUPPORT
+        case CodeGenTarget::DXIL:
+            {
+                List<uint8_t> code;
+                int err = emitDXILForEntryPointUsingDXC(entryPoint, targetReq, code);
+                if (!err)
+                {
+                    maybeDumpIntermediate(compileRequest, code.Buffer(), code.Count(), target);
+                    result = CompileResult(code);
+                }
+            }
+            break;
+
+        case CodeGenTarget::DXILAssembly:
+            {
+                List<uint8_t> code;
+                int err = emitDXILForEntryPointUsingDXC(entryPoint, targetReq, code);
+                if (!err)
+                {
+                    String assembly = dissassembleDXILUsingDXC(
+                        compileRequest,
+                        code.Buffer(),
+                        code.Count());
+
+                    maybeDumpIntermediate(compileRequest, assembly.Buffer(), target);
+
+                    result = CompileResult(assembly);
+                }
+            }
+            break;
+#endif
+
         case CodeGenTarget::SPIRV:
             {
                 List<uint8_t> code = emitSPIRVForEntryPoint(entryPoint, targetReq);
@@ -703,6 +757,17 @@ namespace Slang
                         break;
                 #endif
 
+                #if SLANG_ENABLE_DXIL_SUPPORT
+                    case CodeGenTarget::DXIL:
+                        {
+                            String assembly = dissassembleDXILUsingDXC(compileRequest,
+                                data.begin(),
+                                data.end() - data.begin());
+                            writeOutputToConsole(compileRequest, assembly);
+                        }
+                        break;
+                #endif
+
                     case CodeGenTarget::SPIRV:
                         {
                             String assembly = dissassembleSPIRV(compileRequest,
@@ -943,6 +1008,20 @@ namespace Slang
             }
             break;
     #endif
+
+    #if SLANG_ENABLE_DXIL_SUPPORT
+        case CodeGenTarget::DXILAssembly:
+            dumpIntermediateText(compileRequest, data, size, ".dxil.asm");
+            break;
+
+        case CodeGenTarget::DXIL:
+            dumpIntermediateBinary(compileRequest, data, size, ".dxil");
+            {
+                String dxilAssembly = dissassembleDXILUsingDXC(compileRequest, data, size);
+                dumpIntermediateText(compileRequest, dxilAssembly.begin(), dxilAssembly.Length(), ".dxil.asm");
+            }
+            break;
+    #endif
         }
     }
 

source/slang/compiler.cpp

@@ -47,6 +47,8 @@ namespace Slang
         SPIRVAssembly       = SLANG_SPIRV_ASM,
         DXBytecode          = SLANG_DXBC,
         DXBytecodeAssembly  = SLANG_DXBC_ASM,
+        DXIL                = SLANG_DXIL,
+        DXILAssembly        = SLANG_DXIL_ASM,
     };
 
     enum class ContainerFormat
@@ -126,8 +128,9 @@ namespace Slang
     enum class PassThroughMode : SlangPassThrough
     {
         None = SLANG_PASS_THROUGH_NONE,	// don't pass through: use Slang compiler
-        HLSL = SLANG_PASS_THROUGH_FXC,	// pass through HLSL to `D3DCompile` API
-//			GLSL,	// pass through GLSL to `glslang` library
+        fxc = SLANG_PASS_THROUGH_FXC,	// pass through HLSL to `D3DCompile` API
+        dxc = SLANG_PASS_THROUGH_DXC,	// pass through HLSL to `IDxcCompiler` API
+        glslang = SLANG_PASS_THROUGH_GLSLANG,	// pass through GLSL to `glslang` library
     };
 
     class SourceFile;