diff options
| -rw-r--r-- | source/slang/slang.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index cd8cabfe5..fe7ecc4e9 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -816,8 +816,6 @@ Session::createSession(slang::SessionDesc const& inDesc, slang::ISession** outSe new TypeCheckingCache(*static_cast<TypeCheckingCache*>(m_typeCheckingCache.get())); } - linkage->setMatrixLayoutMode(desc.defaultMatrixLayoutMode); - Int searchPathCount = desc.searchPathCount; for (Int ii = 0; ii < searchPathCount; ++ii) { @@ -845,6 +843,10 @@ Session::createSession(slang::SessionDesc const& inDesc, slang::ISession** outSe linkage->m_optionSet.load(desc.compilerOptionEntryCount, desc.compilerOptionEntries); + if (!linkage->m_optionSet.hasOption(CompilerOptionName::MatrixLayoutColumn) && + !linkage->m_optionSet.hasOption(CompilerOptionName::MatrixLayoutRow)) + linkage->setMatrixLayoutMode(desc.defaultMatrixLayoutMode); + { const Int targetCount = desc.targetCount; const uint8_t* targetDescPtr = reinterpret_cast<const uint8_t*>(desc.targets); |