diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-12-12 16:14:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-12 16:14:27 -0500 |
| commit | a2d4d447639a1860f9de4ba9e2435f1d40ff3669 (patch) | |
| tree | 028e8ddc77ccd08bcb189204de8a1469535d2507 /tools/render-test | |
| parent | 15335549340c54fd7b89b28104ddc907e9c64638 (diff) | |
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.
Diffstat (limited to 'tools/render-test')
| -rw-r--r-- | tools/render-test/options.cpp | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp index 7d3fd27b5..a614336e7 100644 --- a/tools/render-test/options.cpp +++ b/tools/render-test/options.cpp @@ -11,6 +11,7 @@ #include "../../source/core/slang-list.h" #include "../../source/core/slang-string-util.h" +#include "../../source/core/slang-downstream-compiler.h" namespace renderer_test { using namespace Slang; @@ -44,36 +45,6 @@ static SlangResult _setRendererType(RendererType type, const char* arg, Slang::W return SLANG_OK; } -static SlangSourceLanguage _findSourceLanguage(const UnownedStringSlice& text) -{ - if (text == "c" || text == "C") - { - return SLANG_SOURCE_LANGUAGE_C; - } - else if (text == "cpp" || text == "c++" || text == "C++" || text == "cxx") - { - return SLANG_SOURCE_LANGUAGE_CPP; - } - else if (text == "slang") - { - return SLANG_SOURCE_LANGUAGE_SLANG; - } - else if (text == "glsl") - { - return SLANG_SOURCE_LANGUAGE_GLSL; - } - else if (text == "hlsl") - { - return SLANG_SOURCE_LANGUAGE_HLSL; - } - else if (text == "cu" || text == "cuda") - { - return SLANG_SOURCE_LANGUAGE_CUDA; - } - return SLANG_SOURCE_LANGUAGE_UNKNOWN; -} - - SlangResult parseOptions(int argc, const char*const* argv, Slang::WriterHelper stdError) { using namespace Slang; @@ -250,7 +221,7 @@ SlangResult parseOptions(int argc, const char*const* argv, Slang::WriterHelper s } UnownedStringSlice sourceLanguageText(*argCursor++); - SlangSourceLanguage sourceLanguage = _findSourceLanguage(sourceLanguageText); + SlangSourceLanguage sourceLanguage = DownstreamCompiler::getSourceLanguageFromName(sourceLanguageText); if (sourceLanguage == SLANG_SOURCE_LANGUAGE_UNKNOWN) { stdError.print("error: expecting unknown source language name '%s' for '%s'\n", String(sourceLanguageText).getBuffer(), arg); |
