diff options
| author | Yong He <yonghe@outlook.com> | 2020-09-24 14:30:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 14:30:12 -0700 |
| commit | b72353ec3fe529237828cacbe710233d31eb4837 (patch) | |
| tree | 2aec9af97efe52b722cb730f8db1c44641e58c62 /source/slang/slang.cpp | |
| parent | 150218bec9e992d32833dd9a0c1396a4d7c12b7e (diff) | |
Enable default cpp prelude. (#1560)
* Enable default cpp prelude.
* Print the "#include" line as a normal source if the file does not exist.
* Bug fix
* Fix.
* Fix c++ prelude header.
* Remove unnecessary fopen call.
Diffstat (limited to 'source/slang/slang.cpp')
| -rw-r--r-- | source/slang/slang.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 1086338f4..572c9c3a3 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -41,8 +41,9 @@ #undef NOMINMAX #endif -extern char const* slang_cuda_prelude; -extern char const* slang_hlsl_prelude; +extern Slang::String get_slang_cuda_prelude(); +extern Slang::String get_slang_cpp_prelude(); +extern Slang::String get_slang_hlsl_prelude(); namespace Slang { @@ -189,8 +190,9 @@ void Session::init() } // Set up default prelude code for target languages that need a prelude - m_languagePreludes[Index(SourceLanguage::CUDA)] = slang_cuda_prelude; - m_languagePreludes[Index(SourceLanguage::HLSL)] = slang_hlsl_prelude; + m_languagePreludes[Index(SourceLanguage::CUDA)] = get_slang_cuda_prelude(); + m_languagePreludes[Index(SourceLanguage::CPP)] = get_slang_cpp_prelude(); + m_languagePreludes[Index(SourceLanguage::HLSL)] = get_slang_hlsl_prelude(); } ISlangUnknown* Session::getInterface(const Guid& guid) |
