Bugfix/multi buffers

djinni/map/core.djinni

@@ -181,6 +181,8 @@ map_camera_interface = interface +c {
     screen_pos_from_coord_zoom(coord: coord, zoom: f32): vec_2_f;
 
     map_units_from_pixels(distancePx: f64): f64;
+    get_scaling_factor(): f64;
+
     # padding in percentage, where 1.0 = rect is half of full width and height
     coord_is_visible_on_screen(coord: coord, padding_pc: f32): bool;
 

ios/graphics/Model/BaseGraphicsObject.swift

@@ -32,30 +32,37 @@ open class BaseGraphicsObject: @unchecked Sendable {
     public let lock = OSLock()
 
     public var originOffset: MCVec3D = .init(x: 0, y: 0, z: 0)
-    public var originOffsetBuffer: MTLBuffer?
 
-    public init(device: MTLDevice, sampler: MTLSamplerState, label: String = "") {
+    public var originOffsetBuffers: MultiBuffer<simd_float4>
+
+    public var vpMatrixBuffers: MultiBuffer<simd_float4x4>
+
+    public init(device: MTLDevice, sampler: MTLSamplerState, label: String = "")
+    {
         self.device = device
         self.sampler = sampler
         self.label = label
-
-        var originOffset: simd_float4 = simd_float4(0, 0, 0, 0)
-        originOffsetBuffer = device.makeBuffer(bytes: &originOffset, length: MemoryLayout<simd_float4>.stride, options: [])
+        self.originOffsetBuffers = .init(device: device)
+        self.vpMatrixBuffers = .init(device: device)
     }
 
-    open func render(encoder _: MTLRenderCommandEncoder,
-                     context _: RenderingContext,
-                     renderPass _: MCRenderPassConfig,
-                     vpMatrix _: Int64,
-                     mMatrix _: Int64,
-                     origin: MCVec3D,
-                     isMasked _: Bool,
-                     screenPixelAsRealMeterFactor _: Double) {
+    open func render(
+        encoder _: MTLRenderCommandEncoder,
+        context _: RenderingContext,
+        renderPass _: MCRenderPassConfig,
+        vpMatrix _: Int64,
+        mMatrix _: Int64,
+        origin: MCVec3D,
+        isMasked _: Bool,
+        screenPixelAsRealMeterFactor _: Double
+    ) {
         fatalError("has to be overwritten by subclass")
     }
 
-    open func compute(encoder _: MTLComputeCommandEncoder,
-                      context _: RenderingContext) {
+    open func compute(
+        encoder _: MTLComputeCommandEncoder,
+        context _: RenderingContext
+    ) {
         // subclasses may override
     }
 }
@@ -80,32 +87,42 @@ extension BaseGraphicsObject: MCGraphicsObjectInterface {
         maskInverse = inversed
     }
 
-    public func render(_ context: MCRenderingContextInterface?, renderPass: MCRenderPassConfig, vpMatrix: Int64, mMatrix: Int64, origin: MCVec3D, isMasked: Bool, screenPixelAsRealMeterFactor: Double) {
+    public func render(
+        _ context: MCRenderingContextInterface?, renderPass: MCRenderPassConfig,
+        vpMatrix: Int64, mMatrix: Int64, origin: MCVec3D, isMasked: Bool,
+        screenPixelAsRealMeterFactor: Double
+    ) {
         guard isReady(),
-              let context = context as? RenderingContext,
-              let encoder = context.encoder
+            let context = context as? RenderingContext,
+            let encoder = context.encoder
         else { return }
 
-        render(encoder: encoder,
-               context: context,
-               renderPass: renderPass,
-               vpMatrix: vpMatrix,
-               mMatrix: mMatrix,
-               origin: origin,
-               isMasked: isMasked,
-               screenPixelAsRealMeterFactor: screenPixelAsRealMeterFactor)
+        render(
+            encoder: encoder,
+            context: context,
+            renderPass: renderPass,
+            vpMatrix: vpMatrix,
+            mMatrix: mMatrix,
+            origin: origin,
+            isMasked: isMasked,
+            screenPixelAsRealMeterFactor: screenPixelAsRealMeterFactor)
     }
 
-    public func compute(_ context: (any MCRenderingContextInterface)?, renderPass: MCRenderPassConfig) {
+    public func compute(
+        _ context: (any MCRenderingContextInterface)?,
+        renderPass: MCRenderPassConfig
+    ) {
         guard let context = context as? RenderingContext,
-              let encoder = context.computeEncoder
+            let encoder = context.computeEncoder
         else { return }
         compute(encoder: encoder, context: context)
     }
 
     // MARK: - Stencil
 
-    public func maskStencilState(readMask: UInt32 = 0b1111_1111, writeMask: UInt32 = 0b0000_0000) -> MTLDepthStencilState? {
+    public func maskStencilState(
+        readMask: UInt32 = 0b1111_1111, writeMask: UInt32 = 0b0000_0000
+    ) -> MTLDepthStencilState? {
         let s = MTLStencilDescriptor()
         s.stencilCompareFunction = .equal
         s.stencilFailureOperation = .zero

ios/graphics/Model/Icosahedron/Icosahedron.swift

@@ -69,9 +69,12 @@ final class Icosahedron: BaseGraphicsObject, @unchecked Sendable {
         shader.preRender(context)
 
         encoder.setVertexBuffer(verticesBuffer, offset: 0, index: 0)
+
+        let vpMatrixBuffer = vpMatrixBuffers.getNextBuffer(context)
         if let matrixPointer = UnsafeRawPointer(bitPattern: Int(vpMatrix)) {
-            encoder.setVertexBytes(matrixPointer, length: 64, index: 1)
+            vpMatrixBuffer?.contents().copyMemory(from: matrixPointer, byteCount: 64)
         }
+        encoder.setVertexBuffer(vpMatrixBuffer, offset: 0, index: 1)
 
         encoder.drawIndexedPrimitives(type: .triangle,
                                       indexCount: indicesCount,
@@ -120,9 +123,12 @@ extension Icosahedron: MCMaskingObjectInterface {
         shader.preRender(context)
 
         encoder.setVertexBuffer(verticesBuffer, offset: 0, index: 0)
+
+        let vpMatrixBuffer = vpMatrixBuffers.getNextBuffer(context)
         if let matrixPointer = UnsafeRawPointer(bitPattern: Int(vpMatrix)) {
-            encoder.setVertexBytes(matrixPointer, length: 64, index: 1)
+            vpMatrixBuffer?.contents().copyMemory(from: matrixPointer, byteCount: 64)
         }
+        encoder.setVertexBuffer(vpMatrixBuffer, offset: 0, index: 1)
 
         encoder.drawIndexedPrimitives(type: .triangle,
                                       indexCount: indicesCount,

ios/graphics/Model/Line/LineGroup2d.swift

@@ -36,6 +36,7 @@ final class LineGroup2d: BaseGraphicsObject, @unchecked Sendable {
                    label: "LineGroup2d")
         var originOffset: simd_float4 = simd_float4(0, 0, 0, 0)
         tileOriginBuffer = metalContext.device.makeBuffer(bytes: &originOffset, length: MemoryLayout<simd_float4>.stride, options: [])
+
     }
 
     private func setupStencilBufferDescriptor() {
@@ -115,10 +116,13 @@ final class LineGroup2d: BaseGraphicsObject, @unchecked Sendable {
 
         encoder.setVertexBuffer(lineVerticesBuffer, offset: 0, index: 0)
 
+        let vpMatrixBuffer = vpMatrixBuffers.getNextBuffer(context)
         if let matrixPointer = UnsafeRawPointer(bitPattern: Int(vpMatrix)) {
-            encoder.setVertexBytes(matrixPointer, length: 64, index: 1)
+            vpMatrixBuffer?.contents().copyMemory(from: matrixPointer, byteCount: 64)
         }
+        encoder.setVertexBuffer(vpMatrixBuffer, offset: 0, index: 1)
 
+        let originOffsetBuffer = originOffsetBuffers.getNextBuffer(context)
         if let bufferPointer = originOffsetBuffer?.contents().assumingMemoryBound(to: simd_float4.self) {
             bufferPointer.pointee.x = Float(originOffset.x - origin.x)
             bufferPointer.pointee.y = Float(originOffset.y - origin.y)
@@ -158,6 +162,9 @@ extension LineGroup2d: MCLineGroup2dInterface {
                 bufferPointer.pointee.y = originOffset.yF
                 bufferPointer.pointee.z = originOffset.zF
             }
+            else {
+                fatalError()
+            }
             self.lineVerticesBuffer.copyOrCreate(from: lines, device: device)
             self.lineIndicesBuffer.copyOrCreate(from: indices, device: device)
             if self.lineVerticesBuffer != nil, self.lineIndicesBuffer != nil {

ios/graphics/Model/MultiBuffer.swift

@@ -0,0 +1,70 @@
+//
+//  MultiBuffer.swift
+//  MapCore
+//
+//  Created by Nicolas Märki on 04.11.2024.
+//
+
+import Metal
+import simd
+
+public struct MultiBuffer<DataType> {
+    // Warning: Seems like suited to be generic
+    // But makeBuffer &reference does not like generic data
+    var buffers: [MTLBuffer]
+
+    fileprivate init(buffers: [MTLBuffer]) {
+        self.buffers = buffers
+    }
+
+    public mutating func getNextBuffer(_ context: RenderingContext)
+        -> MTLBuffer?
+    {
+        return buffers[context.currentBufferIndex]
+    }
+}
+
+extension MultiBuffer<simd_float1> {
+    public init(device: MTLDevice) {
+        var initialMutable = simd_float1(1.0)
+        let buffers: [MTLBuffer] = (0..<RenderingContext.bufferCount).compactMap
+        { _ in
+            device
+                .makeBuffer(
+                    bytes: &initialMutable,
+                    length: MemoryLayout<simd_float1>.stride
+                )
+        }
+        self.init(buffers: buffers)
+    }
+}
+
+extension MultiBuffer<simd_float4> {
+    public init(device: MTLDevice) {
+        var initialMutable = simd_float4(0.0, 0.0, 0.0, 0.0)
+        let buffers: [MTLBuffer] = (0..<RenderingContext.bufferCount).compactMap
+        { _ in
+            device
+                .makeBuffer(
+                    bytes: &initialMutable,
+                    length: MemoryLayout<simd_float4>.stride
+                )
+        }
+        self.init(buffers: buffers)
+    }
+}
+
+extension MultiBuffer<simd_float4x4> {
+    public init(device: MTLDevice) {
+        var initialMutable = simd_float4x4(1.0)
+        let buffers: [MTLBuffer] = (0..<RenderingContext.bufferCount).compactMap
+        { _ in
+            device
+                .makeBuffer(
+                    bytes: &initialMutable,
+                    length: MemoryLayout<simd_float4x4>.stride
+                )
+        }
+        self.init(buffers: buffers)
+    }
+}