WIP

Author: hoffstadt

examples/example_gfx_2.c

@@ -181,7 +181,8 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
             "../shaders/",
             "../examples/shaders/"
         },
-        .tFlags = PL_SHADER_FLAGS_AUTO_OUTPUT | PL_SHADER_FLAGS_NEVER_CACHE
+        .pcCacheOutputDirectory = "../shader-temp/",
+        .tFlags = PL_SHADER_FLAGS_AUTO_OUTPUT | PL_SHADER_FLAGS_ALWAYS_COMPILE | PL_SHADER_FLAGS_INCLUDE_DEBUG
     };
     gptShader->initialize(&tDefaultShaderOptions);
 

extensions/pl_graphics_metal.m

@@ -1018,7 +1018,7 @@
         ptPool->tDesc.szStorageTextureBindings +
         ptPool->tDesc.szAttachmentTextureBindings;
 
-    ptPool->szHeapSize = szMaxSets * sizeof(uint32_t);
+    ptPool->szHeapSize = szMaxSets * sizeof(uint64_t);
 
     MTLHeapDescriptor* ptHeapDescriptor = [MTLHeapDescriptor new];
     ptHeapDescriptor.storageMode = MTLStorageModeShared;
@@ -1276,19 +1276,30 @@
 
     // vertex layout
     MTLVertexDescriptor* vertexDescriptor = [MTLVertexDescriptor vertexDescriptor];
-    vertexDescriptor.layouts[4].stepRate = 1;
-    vertexDescriptor.layouts[4].stepFunction = MTLVertexStepFunctionPerVertex;
-    vertexDescriptor.layouts[4].stride = ptDescription->atVertexBufferLayouts[0].uByteStride;
 
+    uint32_t uVertexBufferCount = 0;
     uint32_t uCurrentAttributeCount = 0;
-    for(uint32_t i = 0; i < PL_MAX_VERTEX_ATTRIBUTES; i++)
+    for(uint32_t uVtxBufferIdx = 0; uVtxBufferIdx < 2; uVtxBufferIdx++)
     {
-        if(ptDescription->atVertexBufferLayouts[0].atAttributes[i].tFormat == PL_VERTEX_FORMAT_UNKNOWN)
+        if(ptDescription->atVertexBufferLayouts[uVtxBufferIdx].uByteStride == 0)
             break;
-        vertexDescriptor.attributes[i].bufferIndex = 4;
-        vertexDescriptor.attributes[i].offset = ptDescription->atVertexBufferLayouts[0].atAttributes[i].uByteOffset;
-        vertexDescriptor.attributes[i].format = pl__metal_vertex_format(ptDescription->atVertexBufferLayouts[0].atAttributes[i].tFormat);
-        uCurrentAttributeCount++;
+
+        for (uint32_t i = 0; i < PL_MAX_VERTEX_ATTRIBUTES; i++)
+        {
+            if(ptDescription->atVertexBufferLayouts[uVtxBufferIdx].atAttributes[i].tFormat == PL_VERTEX_FORMAT_UNKNOWN)
+                break;
+            const uint32_t uLocation = ptDescription->atVertexBufferLayouts[uVtxBufferIdx].bExplicitLocation ? ptDescription->atVertexBufferLayouts[uVtxBufferIdx].atAttributes[i].uLocation : uCurrentAttributeCount;
+            vertexDescriptor.attributes[uLocation].bufferIndex = 4 + uVtxBufferIdx;
+            vertexDescriptor.attributes[uLocation].offset = ptDescription->atVertexBufferLayouts[uVtxBufferIdx].atAttributes[i].uByteOffset;
+            vertexDescriptor.attributes[uLocation].format = pl__metal_vertex_format(ptDescription->atVertexBufferLayouts[uVtxBufferIdx].atAttributes[i].tFormat);
+            uCurrentAttributeCount++;
+
+        }
+
+        vertexDescriptor.layouts[4 + uVtxBufferIdx].stepRate = 1;
+        vertexDescriptor.layouts[4 + uVtxBufferIdx].stepFunction = MTLVertexStepFunctionPerVertex;
+        vertexDescriptor.layouts[4 + uVtxBufferIdx].stride = ptDescription->atVertexBufferLayouts[uVtxBufferIdx].uByteStride;
+        uVertexBufferCount++;
     }
 
     // prepare preprocessor defines