Fix race condition with compact buffers and pending sets

See: 6a5c280
aardvark-platform · Jan 23, 2025 · e854719 · e854719
1 parent 85bfea2
commit e854719
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Aardvark.Rendering/Resources/Adaptive/AdaptiveCompactBuffer.fs b/src/Aardvark.Rendering/Resources/Adaptive/AdaptiveCompactBuffer.fs
@@ -110,17 +110,19 @@ module internal CompactBufferImplementation =
         let mutable currentIndex = index
 
         member x.Write(token : AdaptiveToken) =
-            x.EvaluateIfNeeded token () (fun token ->
-                let offset = nativeint currentIndex * elementSize
-                let value = evaluate.Invoke(token, input)
-                buffer.Write(value, offset)
-            )
+            if currentIndex >= 0 then
+                x.EvaluateIfNeeded token () (fun token ->
+                    let offset = nativeint currentIndex * elementSize
+                    let value = evaluate.Invoke(token, input)
+                    buffer.Write(value, offset)
+                )
 
         member x.SetIndex(index : int) =
             currentIndex <- index
             x.MarkOutdated()
 
         member x.Dispose() =
+            currentIndex <- -1
             x.Outputs.Clear()
 
         interface IDisposable with
@@ -176,8 +178,7 @@ module internal CompactBufferImplementation =
         override x.InputChangedObject(_, object) =
             match object with
             | :? Writer<'Key, 'Value> as w -> pending.Add w |> ignore
-            | _ ->
-                ()
+            | _ -> ()
 
         override x.Update(token : AdaptiveToken) =
             for w in pending.GetAndClear() do

diff --git a/src/Aardvark.Rendering/Resources/Adaptive/ManagedBuffer.fs b/src/Aardvark.Rendering/Resources/Adaptive/ManagedBuffer.fs
@@ -236,8 +236,7 @@ module internal ManagedBufferImplementation =
         override x.InputChangedObject(_, object) =
             match object with
             | :? AbstractWriter as writer -> pending.Add writer |> ignore
-            | _ ->
-                ()
+            | _ -> ()
 
         interface IManagedBuffer<'T> with
             member x.ElementType = typeof<'T>