update gitmodules

LuisaGroup · Nov 27, 2024 · 5f68543 · 5f68543
1 parent 52caeaf
commit 5f68543
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -12,8 +12,8 @@
 	url = https://github.com/syoyo/tinyexr.git
 [submodule "src/compute"]
 	path = src/compute
-	url = git@github.com:LuisaGroup/LuisaCompute-coroutine.git
-	branch = refactor-api
+	url = https://github.com/LuisaGroup/LuisaCompute-coroutine.git
+	branch = next
 [submodule "src/ext/json"]
 	path = src/ext/json
 	url = https://github.com/nlohmann/json.git
diff --git a/src/compute b/src/compute
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -30,6 +30,15 @@ target_link_libraries(luisa-render-util PUBLIC
         luisa::compute
         luisa-render-include
         luisa-render-ext)
+
+# work around the clang bug: https://github.com/Homebrew/homebrew-core/issues/169820
+if (APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND
+        CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18)
+    cmake_path(GET CMAKE_CXX_COMPILER PARENT_PATH CLANG_BIN_PATH)
+    cmake_path(GET CLANG_BIN_PATH PARENT_PATH CLANG_ROOT_PATH)
+    target_link_libraries(luisa-compute-core PUBLIC "-L${CLANG_ROOT_PATH}/lib/c++")
+endif ()
+
 set_target_properties(luisa-render-util PROPERTIES
         WINDOWS_EXPORT_ALL_SYMBOLS ON
         UNITY_BUILD ${LUISA_RENDER_ENABLE_UNITY_BUILD})
+7 −14		include/luisa/coro/schedulers/persistent_threads.h
+1 −1		scripts/print_hlsl_builtin.lua
+9 −0		src/backends/common/hlsl/builtin/coroutine
+4 −0		src/backends/common/hlsl/builtin/coroutine.c
+4 −0		src/backends/common/hlsl/hlsl_codegen_util.cpp
+61 −48		src/coro/schedulers/persistent_threads.cpp