From a2d4d447639a1860f9de4ba9e2435f1d40ff3669 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Thu, 12 Dec 2019 16:14:27 -0500
Subject: Feature/source downstream compiler (#1153)

* CPPCompiler -> DownstreamCompiler

* Added DownstreamCompileResult to start abstraction such that we don't need files.

* * Split out slang-blob.cpp
* Made CompileResult hold a DownstreamCompileResult - for access to binary or ISlangSharedLibrary

* Keep temporary files in scope.

* Add a hash to the hex dump stream.

* Move all file tracking into DownstreamCompiler.

* WIP support for nvrtc.

* WIP: Adding support for nvrtc compiler.
Adding enum types, wiring up the nvrtc into slang.

* Fix remaining CPPCompiler references.

* Fix order issue on target string matching.

* Use ISlangSharedLibrary for nvrtc.

* Use DownstreamCompiler for nvrtc.

* WIP first pass at compilation win nvrtc.

* Added testing if file is on file system into CommandLineDownstreamCompiler.
Added sourceContentsPath.

* Make test cuda-compile.cu work by just compiling not comparing output.

* Genearlize DownstreamCompiler usage.

* Fix warning on clang.

* Remove CompilerType from DownstreamCompiler.

* Use DownstreamCompiler interface for all compilers.

NOTE for FXC, DXC and GLSLANG this doesn't mean using 'compile' - it's still extracting functions from shared library.

* Replace DownstreamCompiler::SourceType -> SlangSourceLanguage

* Replace _canCompile with something data driven.

* Fix compiling on gcc/clang for DownstreamCompiler.

* Moved some text conversions into DownstreamCompiler.

* Fix problem on non-vc builds with not having return on locateCompilers for VS.

* Change so no warning for code not reachable on locateCompilers for vs.
---
 source/slang/slang.cpp | 39 +++------------------------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

(limited to 'source/slang/slang.cpp')

diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index de3c6b0a6..fce90d612 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -205,46 +205,13 @@ SLANG_NO_THROW const char* SLANG_MCALL Session::getBuildTagString()
     return SLANG_TAG_VERSION;
 }
 
-static bool _canCompile(PassThroughMode compiler, SourceLanguage sourceLanguage)
+SLANG_NO_THROW SlangResult SLANG_MCALL Session::setDefaultDownstreamCompiler(SlangSourceLanguage sourceLanguage, SlangPassThrough defaultCompiler)
 {
-    switch (compiler)
+    if (DownstreamCompiler::canCompile(defaultCompiler, sourceLanguage))
     {
-        case PassThroughMode::Fxc:      
-        case PassThroughMode::Dxc:
-        {
-            return sourceLanguage == SourceLanguage::HLSL;
-        }
-        case PassThroughMode::Glslang:
-        {
-            return sourceLanguage == SourceLanguage::GLSL;
-        }
-        case PassThroughMode::Clang:
-        case PassThroughMode::VisualStudio:
-        case PassThroughMode::Gcc:
-        case PassThroughMode::GenericCCpp:
-        {
-            return sourceLanguage == SourceLanguage::C || sourceLanguage == SourceLanguage::CPP;
-        }
-        case PassThroughMode::NVRTC:
-        {
-            return sourceLanguage == SourceLanguage::CUDA;
-        }
-        default: break;
-    }
-    return false;
-}
-
-SLANG_NO_THROW SlangResult SLANG_MCALL Session::setDefaultDownstreamCompiler(SlangSourceLanguage inSourceLanguage, SlangPassThrough defaultCompiler)
-{
-    auto sourceLanguage = SourceLanguage(inSourceLanguage);
-    auto compiler = PassThroughMode(defaultCompiler);
-
-    if (_canCompile(compiler, sourceLanguage))
-    {
-        m_defaultDownstreamCompilers[int(sourceLanguage)] = compiler;
+        m_defaultDownstreamCompilers[int(sourceLanguage)] = PassThroughMode(defaultCompiler);
         return SLANG_OK;
     }
-    
     return SLANG_FAIL;
 }
 
-- 
cgit v1.2.3