diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2019-09-23 15:42:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 15:42:06 -0400 |
| commit | e9f0544aa4737d5cba8424f95485811b4839d76e (patch) | |
| tree | 17f2044335b84d722be26a7e1e5c6d67bc292436 /source/slang/slang-compiler.cpp | |
| parent | 05af41d21d74d24871507e6f8f50574ea08c48a2 (diff) | |
Fix for preprocessor defines for C++ / C (#1063)
* First pass support for performance profiling
* Test across all elements
* Fix bug - sourceContents is not used, should use rawSource.
* * Add ability to get prelude from API.
* Allow specifying source language for render-test
* Made it possible to compile a test input file as C++
* Special handling for reflection
* Added C++ impl to performance-profile.slang
* Remove some clang warnings.
* Output profile timings on appveyor and other TC.
* Remove passing around of StdWriters (can use global).
Small comment improvements.
* Fix defines being passed through to Visual Studio.
* Fix bug handling preprocessor definitions in Gcc/Clang targets.
Diffstat (limited to 'source/slang/slang-compiler.cpp')
| -rw-r--r-- | source/slang/slang-compiler.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/slang/slang-compiler.cpp b/source/slang/slang-compiler.cpp index 0860a339c..a24289d22 100644 --- a/source/slang/slang-compiler.cpp +++ b/source/slang/slang-compiler.cpp @@ -1243,6 +1243,13 @@ SlangResult dissassembleDXILUsingDXC( { preprocessorDefinitions.Add(define.Key, define.Value); } + { + auto linkage = targetReq->getLinkage(); + for (auto& define : linkage->preprocessorDefinitions) + { + preprocessorDefinitions.Add(define.Key, define.Value); + } + } { /* TODO(JS): Not totally clear what options should be set here. If we are using the pass through - then using say the defines/includes |