first little steps

src/CommandBuffer.hs

@@ -25,6 +25,7 @@ import Devices
 import Types
 import Memory
 import Util
+import Control.Exception (bracket, bracket_)
 
 frameOverlap :: Int
 frameOverlap = 2
@@ -275,7 +276,8 @@ recordCommandBuffer
           deviceProps
 
 
-    scenePointer <- VMA.mapMemory allocator (bufferAllocation sceneParameterBuffer)
+    liftIO $ VMA.withMappedMemory allocator (bufferAllocation sceneParameterBuffer) bracket $
+      \scenePointer ->
 
         -- dataPointer <- liftIO $ new scenePointer
 
@@ -298,7 +300,7 @@ recordCommandBuffer
         --   test <- peek (castPtr scenePointer :: Ptr GPUSceneData)
         --   print test
 
-    VMA.unmapMemory allocator (bufferAllocation sceneParameterBuffer)
+        -- VMA.unmapMemory allocator (bufferAllocation sceneParameterBuffer)
  
     renderObjects <- (liftIO . STM.atomically . STM.readTMVar) =<< asks renderables
     meshMap <- (liftIO . STM.atomically . STM.readTMVar) =<< asks meshLibrary
@@ -330,11 +332,15 @@ recordCommandBuffer
             mesh = meshMap M.! meshID
             material = materialMap M.! materialID
 
-        memoryPointer <- VMA.mapMemory allocator (bufferAllocation $ frameCameraBuffer frame)
+        liftIO $ VMA.withMappedMemory
+          allocator
+          (bufferAllocation $ frameCameraBuffer frame)
+          bracket
+          $ \memoryPointer ->
 
             liftIO $ poke (castPtr memoryPointer) cameraData
 
-        VMA.unmapMemory allocator (bufferAllocation $ frameCameraBuffer frame)
+        -- VMA.unmapMemory allocator (bufferAllocation $ frameCameraBuffer frame)
 
         Vk.cmdBindPipeline commandBuffer Vk.PIPELINE_BIND_POINT_GRAPHICS (materialPipeline material)
 

src/Init.hs

@@ -203,7 +203,7 @@ initDescriptors device = do
         0
       sceneBind = descriptorsetLayoutBinding
         Vk.DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC
-        (Vk.SHADER_STAGE_VERTEX_BIT .|. Vk.SHADER_STAGE_FRAGMENT_BIT)
+        Vk.SHADER_STAGE_FRAGMENT_BIT
         1
       objectBind = descriptorsetLayoutBinding
         Vk.DESCRIPTOR_TYPE_STORAGE_BUFFER