diff options
| author | Yong He <yonghe@outlook.com> | 2024-10-14 14:03:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 14:03:01 -0700 |
| commit | f857815a8c0a4e8d4f35c9a49c655545fb692195 (patch) | |
| tree | 78fecf229aece79d27d4d42664eda267706670c5 /source | |
| parent | 5126d58ab2252357014df4136a4a1e07c7c2d5f4 (diff) | |
Misc build fixes. (#5271)
* Don't use __assume for SLANG_ASSERT + build fixes.
* Fix.
* build slang-wasm conditionally
* Fix.
* revert retry open file
* revert include.
* another attempt of silencing compiler warnings.
* revert assume change.
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang-wasm/slang-wasm.cpp | 7 | ||||
| -rw-r--r-- | source/slang/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/slang/slang-check-decl.cpp | 2 | ||||
| -rw-r--r-- | source/slangc/main.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/source/slang-wasm/slang-wasm.cpp b/source/slang-wasm/slang-wasm.cpp index c2cbe66b6..ee64f0e9b 100644 --- a/source/slang-wasm/slang-wasm.cpp +++ b/source/slang-wasm/slang-wasm.cpp @@ -45,10 +45,9 @@ Session* GlobalSession::createSession() SessionDesc sessionDesc = {}; sessionDesc.structureSize = sizeof(sessionDesc); constexpr SlangInt targetCount = 1; - TargetDesc targets[targetCount] = { - {.structureSize = sizeof(TargetDesc), .format = SLANG_WGSL} - }; - sessionDesc.targets = targets; + TargetDesc target = {}; + target.format = SLANG_WGSL; + sessionDesc.targets = ⌖ sessionDesc.targetCount = targetCount; SlangResult result = m_interface->createSession(sessionDesc, &session); if (result != SLANG_OK) diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index cf12e6c24..8e3be2069 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -20,7 +20,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E make_directory ${SLANG_CAPABILITY_OUTPUT_DIR} COMMAND slang-capability-generator ${SLANG_CAPABILITY_SOURCE} --target-directory - ${SLANG_CAPABILITY_OUTPUT_DIR} + ${SLANG_CAPABILITY_OUTPUT_DIR} --doc "${slang_SOURCE_DIR}/docs/user-guide/a3-02-reference-capability-atoms.md" DEPENDS ${SLANG_CAPABILITY_SOURCE} slang-capability-generator WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} VERBATIM diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index 5ca1baeec..781a3a237 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -5919,7 +5919,7 @@ namespace Slang intrinsicOpModifier->op = kIROp_IntCast; break; default: - SLANG_ASSERT("unknown builtin requirement kind."); + SLANG_UNEXPECTED("unknown builtin requirement kind."); } synFunc->loc = context->parentDecl->closingSourceLoc; synFunc->nameAndLoc.loc = synFunc->loc; diff --git a/source/slangc/main.cpp b/source/slangc/main.cpp index 6e76e2f93..c7cca428b 100644 --- a/source/slangc/main.cpp +++ b/source/slangc/main.cpp @@ -104,7 +104,7 @@ SLANG_TEST_TOOL_API SlangResult innerMain(StdWriters* stdWriters, slang::IGlobal SlangResult res = _compile(compileRequest, argc, argv); // Now that we are done, clean up after ourselves spDestroyCompileRequest(compileRequest); - + return res; } |