WIP

Author: hoffstadt

assets/core/scenes/scene-helmet.json

@@ -111,7 +111,7 @@
                 "uResolution": 128,
                 "uSamples": 1024,
                 "uInterval": 6,
-                "tFlags": ["PL_ENVIRONMENT_PROBE_FLAGS_INCLUDE_SKY", "PL_ENVIRONMENT_PROBE_FLAGS_REALTIME"]
+                "tFlags": ["PL_ENVIRONMENT_PROBE_FLAGS_INCLUDE_SKY"]
             }
         ],
         "entities": [

extensions/pl_graphics_metal.m

@@ -551,46 +551,70 @@
 }
 
 void
-pl_graphics_copy_buffer_to_texture(plBlitEncoder* ptEncoder, plBufferHandle tBufferHandle, plTextureHandle tTextureHandle, uint32_t uRegionCount, const plBufferImageCopy* ptRegions)
+pl_graphics_copy_buffer_to_texture(
+    plBlitEncoder* ptEncoder,
+    plBufferHandle tBufferHandle,
+    plTextureHandle tTextureHandle,
+    uint32_t uRegionCount,
+    const plBufferImageCopy* ptRegions
+)
 {
     plCommandBuffer* ptCmdBuffer = ptEncoder->ptCommandBuffer;
-
-    // if(!ptEncoder->bActive)
-    // {
-    //     ptEncoder->tEncoder = [ptCmdBuffer->tCmdBuffer4 computeCommandEncoder];
-    //     ptEncoder->bActive = true;
-    // }
-
     plDevice* ptDevice = ptCmdBuffer->ptDevice;
 
-    plMetalBuffer* ptBuffer = &ptDevice->sbtBuffersHot[tBufferHandle.uIndex];
-    plMetalTexture* ptTexture = &ptDevice->sbtTexturesHot[tTextureHandle.uIndex];
-    plTexture* ptColdTexture = pl_graphics_get_texture(ptDevice, tTextureHandle);
-    plBuffer* ptColdBuffer = pl_graphics_get_buffer(ptDevice, tBufferHandle);
+    plMetalBuffer*  ptBuffer      = &ptDevice->sbtBuffersHot[tBufferHandle.uIndex];
+    plMetalTexture* ptTexture     = &ptDevice->sbtTexturesHot[tTextureHandle.uIndex];
+    plTexture*      ptColdTexture = pl_graphics_get_texture(ptDevice, tTextureHandle);
+
+    const uint32_t uFormatStride = pl__format_stride(ptColdTexture->tDesc.tFormat);
 
     for(uint32_t i = 0; i < uRegionCount; i++)
     {
+        const plBufferImageCopy* ptRegion = &ptRegions[i];
+
+        MTLOrigin tOrigin = {
+            .x = ptRegion->iImageOffsetX,
+            .y = ptRegion->iImageOffsetY,
+            .z = ptRegion->iImageOffsetZ
+        };
+
+        MTLSize tSize = {
+            .width  = ptRegion->uImageWidth,
+            .height = ptRegion->uImageHeight,
+            .depth  = ptRegion->uImageDepth
+        };
+
+        const NSUInteger uBytesPerRow =
+            ptRegion->uBufferRowLength ?
+            ptRegion->uBufferRowLength * uFormatStride :
+            tSize.width * uFormatStride;
+
+        const NSUInteger uBytesPerImage =
+            ptRegion->uBufferImageHeight ?
+            uBytesPerRow * ptRegion->uBufferImageHeight :
+            uBytesPerRow * tSize.height;
 
-        MTLOrigin tOrigin;
-        tOrigin.x = ptRegions[i].iImageOffsetX;
-        tOrigin.y = ptRegions[i].iImageOffsetY;
-        tOrigin.z = ptRegions[i].iImageOffsetZ;
-
-        MTLSize tSize;
-        tSize.width  = ptRegions[i].uImageWidth;
-        tSize.height = ptRegions[i].uImageHeight;
-        tSize.depth  = ptRegions[i].uImageDepth;
-
-        NSUInteger uBytesPerRow = tSize.width * pl__format_stride(ptColdTexture->tDesc.tFormat);
-        [ptEncoder->tEncoder copyFromBuffer:ptBuffer->tBuffer
-            sourceOffset:ptRegions[i].szBufferOffset
-            sourceBytesPerRow:uBytesPerRow 
-            sourceBytesPerImage:0 
-            sourceSize:tSize 
-            toTexture:ptTexture->tTexture
-            destinationSlice:ptRegions[i].uBaseArrayLayer
-            destinationLevel:ptRegions[i].uMipLevel 
-            destinationOrigin:tOrigin];
+        const uint32_t uLayerCount =
+            ptRegion->uLayerCount ? ptRegion->uLayerCount : 1;
+
+        for(uint32_t uLayer = 0; uLayer < uLayerCount; uLayer++)
+        {
+            const NSUInteger uSourceOffset =
+                ptRegion->szBufferOffset + uLayer * uBytesPerImage;
+
+            const NSUInteger uDestinationSlice =
+                ptRegion->uBaseArrayLayer + uLayer;
+
+            [ptEncoder->tEncoder copyFromBuffer:ptBuffer->tBuffer
+                sourceOffset:uSourceOffset
+                sourceBytesPerRow:uBytesPerRow
+                sourceBytesPerImage:uBytesPerImage
+                sourceSize:tSize
+                toTexture:ptTexture->tTexture
+                destinationSlice:uDestinationSlice
+                destinationLevel:ptRegion->uMipLevel
+                destinationOrigin:tOrigin];
+        }
 
         pl__metal_barrier_in_encoder(ptEncoder->tEncoder);
     }
@@ -644,45 +668,70 @@
 }
 
 void
-pl_graphics_copy_texture_to_buffer(plBlitEncoder* ptEncoder, plTextureHandle tTextureHandle, plBufferHandle tBufferHandle, uint32_t uRegionCount, const plBufferImageCopy* ptRegions)
+pl_graphics_copy_texture_to_buffer(
+    plBlitEncoder* ptEncoder,
+    plTextureHandle tTextureHandle,
+    plBufferHandle tBufferHandle,
+    uint32_t uRegionCount,
+    const plBufferImageCopy* ptRegions
+)
 {
     plCommandBuffer* ptCmdBuffer = ptEncoder->ptCommandBuffer;
-
-    // if(!ptEncoder->bActive)
-    // {
-    //     ptEncoder->tEncoder = [ptCmdBuffer->tCmdBuffer4 computeCommandEncoder];
-    //     ptEncoder->bActive = true;
-    // }
-
     plDevice* ptDevice = ptCmdBuffer->ptDevice;
+
     const plTexture* ptTexture = pl_graphics_get_texture(ptDevice, tTextureHandle);
     const plMetalTexture* ptMetalTexture = &ptDevice->sbtTexturesHot[tTextureHandle.uIndex];
     const plMetalBuffer* ptMetalBuffer = &ptDevice->sbtBuffersHot[tBufferHandle.uIndex];
 
+    const uint32_t uFormatStride = pl__format_stride(ptTexture->tDesc.tFormat);
+
     for(uint32_t i = 0; i < uRegionCount; i++)
     {
+        const plBufferImageCopy* ptRegion = &ptRegions[i];
 
-        MTLOrigin tOrigin;
-        tOrigin.x = ptRegions[i].iImageOffsetX;
-        tOrigin.y = ptRegions[i].iImageOffsetY;
-        tOrigin.z = ptRegions[i].iImageOffsetZ;
-
-        MTLSize tSize;
-        tSize.width  = ptRegions[i].uImageWidth;
-        tSize.height = ptRegions[i].uImageHeight;
-        tSize.depth  = ptRegions[i].uImageDepth;
-
-        const uint32_t uFormatStride = pl__format_stride(ptTexture->tDesc.tFormat);
-
-        [ptEncoder->tEncoder copyFromTexture:ptMetalTexture->tTexture
-            sourceSlice:ptRegions[i].uBaseArrayLayer
-            sourceLevel:ptRegions[i].uMipLevel
-            sourceOrigin:tOrigin
-            sourceSize:tSize
-            toBuffer:ptMetalBuffer->tBuffer
-            destinationOffset:ptRegions[i].szBufferOffset
-            destinationBytesPerRow:ptTexture->tDesc.tDimensions.x * uFormatStride
-            destinationBytesPerImage:0];
+        MTLOrigin tOrigin = {
+            .x = ptRegion->iImageOffsetX,
+            .y = ptRegion->iImageOffsetY,
+            .z = ptRegion->iImageOffsetZ
+        };
+
+        MTLSize tSize = {
+            .width  = ptRegion->uImageWidth,
+            .height = ptRegion->uImageHeight,
+            .depth  = ptRegion->uImageDepth
+        };
+
+        const NSUInteger uBytesPerRow =
+            ptRegion->uBufferRowLength ?
+            ptRegion->uBufferRowLength * uFormatStride :
+            tSize.width * uFormatStride;
+
+        const NSUInteger uBytesPerImage =
+            ptRegion->uBufferImageHeight ?
+            uBytesPerRow * ptRegion->uBufferImageHeight :
+            uBytesPerRow * tSize.height;
+
+        const uint32_t uLayerCount =
+            ptRegion->uLayerCount ? ptRegion->uLayerCount : 1;
+
+        for(uint32_t uLayer = 0; uLayer < uLayerCount; uLayer++)
+        {
+            const NSUInteger uDestinationOffset =
+                ptRegion->szBufferOffset + uLayer * uBytesPerImage;
+
+            const NSUInteger uSourceSlice =
+                ptRegion->uBaseArrayLayer + uLayer;
+
+            [ptEncoder->tEncoder copyFromTexture:ptMetalTexture->tTexture
+                sourceSlice:uSourceSlice
+                sourceLevel:ptRegion->uMipLevel
+                sourceOrigin:tOrigin
+                sourceSize:tSize
+                toBuffer:ptMetalBuffer->tBuffer
+                destinationOffset:uDestinationOffset
+                destinationBytesPerRow:uBytesPerRow
+                destinationBytesPerImage:uBytesPerImage];
+        }
 
         pl__metal_barrier_in_encoder(ptEncoder->tEncoder);
     }