WIP

Author: hoffstadt

extensions/pl_graphics_metal.m

@@ -395,6 +395,7 @@
     if(ptDesc->ptSwapchain)
     {
         uCount = ptDesc->ptSwapchain->uImageCount;
+        pl_sb_reset(gptGraphics->sbtMainRenderPassHandles);
         pl_sb_push(gptGraphics->sbtMainRenderPassHandles, tHandle);
     }
 
@@ -1765,7 +1766,7 @@
 
     bool bMSAAChange = ptSwap->tInfo.tSampleCount != ptInit->tSampleCount;
 
-    gptGraphics->uCurrentFrameIndex = 0;
+    // gptGraphics->uCurrentFrameIndex = 0;
     ptSwap->tInfo.bVSync = ptInit->bVSync;
     ptSwap->tInfo.uWidth = ptInit->uWidth;
     ptSwap->tInfo.uHeight = ptInit->uHeight;
@@ -1775,13 +1776,13 @@
 
     if(bMSAAChange)
     {
-        uint32_t uNextFrameIndex = (gptGraphics->uCurrentFrameIndex + 1) % gptGraphics->uFramesInFlight;
-        plFrameContext* ptFrame1 = &ptSwap->ptDevice->sbtFrames[uNextFrameIndex];
+        // uint32_t uNextFrameIndex = (gptGraphics->uCurrentFrameIndex + 1) % gptGraphics->uFramesInFlight;
+        // plFrameContext* ptFrame1 = &ptSwap->ptDevice->sbtFrames[uNextFrameIndex];
         plFrameContext* ptFrame0 = pl__get_frame_resources(ptSwap->ptDevice);
         // dispatch_semaphore_wait(ptFrame->tFrameBoundarySemaphore, DISPATCH_TIME_FOREVER);
 
         dispatch_semaphore_signal(ptFrame0->tFrameBoundarySemaphore);
-        dispatch_semaphore_signal(ptFrame1->tFrameBoundarySemaphore);
+        // // dispatch_semaphore_signal(ptFrame1->tFrameBoundarySemaphore);
     }
 }
 
@@ -1860,6 +1861,7 @@
 
     // Wait until the inflight command buffer has completed its work
     // gptGraphics->tSwapchain.uCurrentImageIndex = gptGraphics->uCurrentFrameIndex;
+    gptGraphics->uCurrentFrameIndex = (gptGraphics->uCurrentFrameIndex + 1) % gptGraphics->uFramesInFlight;
     plFrameContext* ptFrame = pl__get_frame_resources(ptDevice);
 
     dispatch_semaphore_wait(ptFrame->tFrameBoundarySemaphore, DISPATCH_TIME_FOREVER);
@@ -1971,7 +1973,6 @@
 
     [ptCommandBuffer->tCmdBuffer commit];
 
-    gptGraphics->uCurrentFrameIndex = (gptGraphics->uCurrentFrameIndex + 1) % gptGraphics->uFramesInFlight;
     return true;
 }
 
@@ -3346,7 +3347,9 @@
         pl_sb_push(ptDevice->sbtSamplerFreeIndices, iResourceIndex);
     }
 
-    for(uint32_t i = 0; i < pl_sb_size(ptGarbage->sbtTextures); i++)
+
+    const uint32_t uTextureCount = pl_sb_size(ptGarbage->sbtTextures);
+    for(uint32_t i = 0; i < uTextureCount; i++)
     {
         const uint16_t uTextureIndex = ptGarbage->sbtTextures[i].uIndex;
         plMetalTexture* ptMetalTexture = &ptDevice->sbtTexturesHot[uTextureIndex];

extensions/pl_renderer_internal.c

@@ -2484,7 +2484,7 @@ pl__renderer_create_probe_data(plScene* ptScene, plEntity tProbeHandle)
         .uMips         = 1,
         .tType         = PL_TEXTURE_TYPE_CUBE,
         .tUsage        = PL_TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT | PL_TEXTURE_USAGE_SAMPLED | PL_TEXTURE_USAGE_INPUT_ATTACHMENT,
-        .pcDebugName   = "offscreen depth texture"
+        .pcDebugName   = "offscreen depth texture probe"
     };
 
     const plTextureDesc tEmmissiveTexDesc = {

extensions/pl_starter_ext.c

@@ -350,7 +350,7 @@ pl_starter_resize(void)
     plBlitEncoder* ptEncoder = NULL;
     if(gptStarterCtx->tFlags & PL_STARTER_FLAGS_DEPTH_BUFFER || gptStarterCtx->tFlags & PL_STARTER_FLAGS_MSAA)
     {
-        ptCommandBuffer = gptGfx->request_command_buffer(gptStarterCtx->atCmdPools[0]);
+        ptCommandBuffer = gptGfx->request_command_buffer(gptStarterCtx->atCmdPools[gptGfx->get_current_frame_index()]);
         gptGfx->begin_command_recording(ptCommandBuffer, NULL);
 
         // begin blit pass, copy buffer, end pass
@@ -1379,7 +1379,7 @@ pl__starter_create_render_pass_with_depth(void)
         .ptSwapchain = gptStarterCtx->ptSwapchain
     };
 
-    plCommandBuffer* ptCommandBuffer = gptGfx->request_command_buffer(gptStarterCtx->atCmdPools[0]);
+    plCommandBuffer* ptCommandBuffer = gptGfx->request_command_buffer(gptStarterCtx->atCmdPools[gptGfx->get_current_frame_index()]);
     gptGfx->begin_command_recording(ptCommandBuffer, NULL);
 
     // begin blit pass, copy buffer, end pass
@@ -1478,7 +1478,7 @@ pl__starter_create_render_pass_with_msaa_and_depth(void)
         .ptSwapchain = gptStarterCtx->ptSwapchain
     };
 
-    plCommandBuffer* ptCommandBuffer = gptGfx->request_command_buffer(gptStarterCtx->atCmdPools[0]);
+    plCommandBuffer* ptCommandBuffer = gptGfx->request_command_buffer(gptStarterCtx->atCmdPools[gptGfx->get_current_frame_index()]);
     gptGfx->begin_command_recording(ptCommandBuffer, NULL);
 
     // begin blit pass, copy buffer, end pass