diff options
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang-compiler.cpp | 7 | ||||
| -rw-r--r-- | source/slang/slang-emit-cpp.cpp | 2 |
2 files changed, 8 insertions, 1 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 diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp index dfc07aecf..1628c6770 100644 --- a/source/slang/slang-emit-cpp.cpp +++ b/source/slang/slang-emit-cpp.cpp @@ -2774,7 +2774,7 @@ void CPPSourceEmitter::emitModuleImpl(IRModule* module) m_writer->emit("uint3 calcGroupThreadID() const \n{\n"); m_writer->indent(); // groupThreadID = dispatchThreadID - groupDispatchThreadID - m_writer->emit("uint3 v = { dispatchThreadID.x - groupDispatchThreadID.x, dispatchThreadID.y - groupDispatchThreadID.y, dispatchThreadID.z - groupDispatchThreadID.z }; "); + m_writer->emit("uint3 v = { dispatchThreadID.x - groupDispatchThreadID.x, dispatchThreadID.y - groupDispatchThreadID.y, dispatchThreadID.z - groupDispatchThreadID.z };\n"); m_writer->emit("return v;\n"); m_writer->dedent(); m_writer->emit("}\n"); |