Fix potential crash when a descriptor set is destroyed but not unbound (

#8215)
google · Oct 18, 2024 · 9e1ee2f · 9e1ee2f
1 parent 22bb67e
commit 9e1ee2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/filament/backend/CMakeLists.txt b/filament/backend/CMakeLists.txt
@@ -540,6 +540,8 @@ if (APPLE AND NOT IOS)
 
 add_executable(metal_utils_test test/MetalTest.mm)
 
+target_compile_options(metal_utils_test PRIVATE "-fobjc-arc")
+
 target_link_libraries(metal_utils_test PRIVATE
         backend
         getopt

diff --git a/filament/backend/src/metal/MetalState.h b/filament/backend/src/metal/MetalState.h
@@ -434,7 +434,7 @@ class MetalBufferBindings {
 
 private:
     static_assert(N <= 8);
-    std::array<__unsafe_unretained id<MTLBuffer>, N> mBuffers = { nil };
+    std::array<__weak id<MTLBuffer>, N> mBuffers = { nil };
     std::array<NSUInteger, N> mOffsets = { 0 };
     utils::bitset8 mDirtyBuffers;
     utils::bitset8 mDirtyOffsets;