diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-12-10 10:02:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 10:02:19 -0500 |
| commit | 79ec0cfdb5f3461c763e0bf712cf42eb87fccb90 (patch) | |
| tree | cf0c3c0b6e7f10d3a29930cd3aeef586298d4234 /source/core/windows | |
| parent | 2e52217cb870b4101c1639fed78224f89bf119b3 (diff) | |
DownstreamCompiler abstraction (#1149)
* 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.
Diffstat (limited to 'source/core/windows')
| -rw-r--r-- | source/core/windows/slang-win-visual-studio-util.cpp | 4 | ||||
| -rw-r--r-- | source/core/windows/slang-win-visual-studio-util.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/core/windows/slang-win-visual-studio-util.cpp b/source/core/windows/slang-win-visual-studio-util.cpp index 260f3f56f..078406d99 100644 --- a/source/core/windows/slang-win-visual-studio-util.cpp +++ b/source/core/windows/slang-win-visual-studio-util.cpp @@ -278,7 +278,7 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out return SLANG_FAIL; } -/* static */SlangResult WinVisualStudioUtil::find(CPPCompilerSet* set) +/* static */SlangResult WinVisualStudioUtil::find(DownstreamCompilerSet* set) { const int versionCount = SLANG_COUNT_OF(s_versionInfos); @@ -290,7 +290,7 @@ static SlangResult _find(int versionIndex, WinVisualStudioUtil::VersionPath& out VersionPath versionPath; if (!set->getCompiler(desc) && SLANG_SUCCEEDED(_find(i, versionPath))) { - RefPtr<CommandLineCPPCompiler> compiler = new VisualStudioCPPCompiler(desc); + RefPtr<CommandLineDownstreamCompiler> compiler = new VisualStudioDownstreamCompiler(desc); calcExecuteCompilerArgs(versionPath, compiler->m_cmdLine); set->addCompiler(compiler); } diff --git a/source/core/windows/slang-win-visual-studio-util.h b/source/core/windows/slang-win-visual-studio-util.h index 34be8473d..1122fccb7 100644 --- a/source/core/windows/slang-win-visual-studio-util.h +++ b/source/core/windows/slang-win-visual-studio-util.h @@ -6,7 +6,7 @@ #include "../slang-process-util.h" -#include "../slang-cpp-compiler.h" +#include "../slang-downstream-compiler.h" namespace Slang { @@ -31,7 +31,7 @@ struct WinVisualStudioUtil static SlangResult find(Version version, VersionPath& outPath); /// Find and add to the set (if not already there) - static SlangResult find(CPPCompilerSet* set); + static SlangResult find(DownstreamCompilerSet* set); /// Create the cmdLine to start compiler for specified path static void calcExecuteCompilerArgs(const VersionPath& versionPath, CommandLine& outCmdLine); @@ -52,10 +52,10 @@ struct WinVisualStudioUtil static void append(Version version, StringBuilder& outBuilder); /// Get version as desc - static CPPCompiler::Desc getDesc(Version version) + static DownstreamCompiler::Desc getDesc(Version version) { - CPPCompiler::Desc desc; - desc.type = CPPCompiler::CompilerType::VisualStudio; + DownstreamCompiler::Desc desc; + desc.type = DownstreamCompiler::CompilerType::VisualStudio; desc.majorVersion = Int(version) / 10; desc.minorVersion = Int(version) % 10; return desc; |
