feat: add more methods to implMTL

pollend · pollend · commit 89637d618e0e · 2024-12-29T11:44:37.000-08:00
Signed-off-by: Michael Pollind &lt;mpollind@gmail.com&gt;
diff --git a/Source/Metal/CommandBufferMTL.mm b/Source/Metal/CommandBufferMTL.mm
@@ -323,6 +323,14 @@
 }
 
 void CommandBufferMTL::ClearAttachments(const ClearDesc* clearDescs, uint32_t clearDescNum, const Rect* rects, uint32_t rectNum) {
+    MTLRenderPassDescriptor* renderPassDesc = [MTLRenderPassDescriptor alloc];
+    id<MTLRenderCommandEncoder> rendererEncoder = [m_Handle renderCommandEncoderWithDescriptor: renderPassDesc];
+  
+    
+    [rendererEncoder setCullMode: MTLCullModeNone];
+    [rendererEncoder setTriangleFillMode: MTLTriangleFillModeFill];
+    [rendererEncoder setDepthBias: 0 slopeScale: 0 clamp: 0];
+   
 }
 
 void CommandBufferMTL::EndCurrentEncoders() {
@@ -525,7 +533,7 @@
                                                (srcRegionDesc->depth == WHOLE_SIZE) ? src.GetSize(2, srcRegionDesc->mipOffset) : srcRegionDesc->depth
                                                );
         
-        // Copy to the texture's final subresource.
+        // Copy to the texture's final subresourc e.
         [m_BlitEncoder copyFromTexture: src.GetHandle()
                            sourceSlice: srcRegionDesc->layerOffset
                            sourceLevel: srcRegionDesc->mipOffset
diff --git a/Source/Metal/CommandQueueMTL.h b/Source/Metal/CommandQueueMTL.h
@@ -34,7 +34,7 @@ struct CommandQueueMTL {
     void SetDebugName(const char* name);
     void Submit(const QueueSubmitDesc& queueSubmitDesc, const SwapChain* swapChain);
     Result UploadData(const TextureUploadDesc* textureUploadDescs, uint32_t textureUploadDescNum, const BufferUploadDesc* bufferUploadDescs, uint32_t bufferUploadDescNum);
-   Result WaitForIdle();
+    Result WaitForIdle();
    
     Result Create(CommandQueueType type);
     
diff --git a/Source/Metal/DescriptorPoolMTL.mm b/Source/Metal/DescriptorPoolMTL.mm
@@ -39,6 +39,8 @@
     
 }
 void DescriptorPoolMTL::Reset() {
+    m_ArgumentOffset = 0;
+    m_AllocatedSets.clear();
     
 }
 
diff --git a/Source/Metal/DeviceMTL.h b/Source/Metal/DeviceMTL.h
@@ -53,7 +53,7 @@ struct DeviceMTL final : public DeviceBase {
     }
     
     
-    id<MTLRenderPipelineState> GetClearPipeline();
+    id<MTLRenderPipelineState> GetClearPipeline(ClearDesc* desc, size_t numFormat);
     
     void Destruct() override;
     Result FillFunctionTable(CoreInterface& table) const override;
diff --git a/Source/Metal/DeviceMTL.mm b/Source/Metal/DeviceMTL.mm
@@ -48,33 +48,9 @@ static uint32_t GetEntryProperty(io_registry_entry_t entry, CFStringRef property
 
 DeviceMTL::DeviceMTL(const CallbackInterface& callbacks, const StdAllocator<uint8_t>& stdAllocator)
 : DeviceBase(callbacks, stdAllocator) {
-    
-    
     m_Desc.graphicsAPI = GraphicsAPI::MTL;
     m_Desc.nriVersionMajor = NRI_VERSION_MAJOR;
     m_Desc.nriVersionMinor = NRI_VERSION_MINOR;
-    
-//    NSString* clearVert = [NSString stringWithCString: " \
-//              #include <metal_stdlib> \
-//              using namespace metal; \
-//              typedef struct { \
-//                  float4 a_position [[attribute(0)]]; \
-//              } AttributesPos; \
-//              typedef struct { \
-//                  float4 colors[9]; \
-//              } ClearColorsIn; \
-//              typedef struct { \
-//                  float4 v_position [[position]]; \
-//                  uint layer [[render_target_array_index]]; \
-//              } VaryingsPos; \
-//              vertex VaryingsPos vertClear(AttributesPos attributes [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) { \
-//                   VaryingsPos varyings; \
-//                   varyings.v_position = float4(attributes.a_position.x, -attributes.a_position.y, ccIn.colors[4].r, 1.0); \
-//                   varyings.layer = uint(attributes.a_position.w); \
-//                   return varyings; \
-//               } \
-//           " encoding: NSASCIIStringEncoding];
-    
 }
 
 
@@ -100,8 +76,106 @@ static uint32_t GetEntryProperty(io_registry_entry_t entry, CFStringRef property
 //}
 
 
-id<MTLRenderPipelineState> DeviceMTL::GetClearPipeline() {
+static id<MTLFunction> initShaderFromSource(id<MTLDevice> dev, NSString* src, NSString* method) {
+    id<MTLFunction> mtlFunc = nil;
+    NSError* err = nil;
+    
+    MTLCompileOptions* options = [MTLCompileOptions alloc];
+    id<MTLLibrary> mtlLib = [dev newLibraryWithSource: src
+                                                   options: options
+                                                     error: &err];    // temp retain
+    NSCAssert(err,  @"Failed to load Metal shader library %@", err );
+    
+    return [mtlLib newFunctionWithName: method];
+}
+
+
+id<MTLRenderPipelineState> DeviceMTL::GetClearPipeline(ClearDesc* desc, size_t numFormats) {
+    
+    NSString* clearVert = [NSString stringWithCString: "\
+#include <metal_stdlib> \n\
+using namespace metal; \n\
+typedef struct { \n\
+  float4 a_position [[attribute(0)]]; \n\
+} AttributesPos; \n\
+typedef struct { \n\
+  float4 colors[16]; \n\
+} ClearColorsIn; \n\
+typedef struct { \n\
+  float4 v_position [[position]]; \n\
+  uint layer [[render_target_array_index]]; \n\
+} VaryingsPos; \n\
+vertex VaryingsPos vertClear(AttributesPos attributes [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
+   VaryingsPos varyings; \n \
+   varyings.v_position = float4(attributes.a_position.x, -attributes.a_position.y, ccIn.colors[4].r, 1.0); \n\
+   varyings.layer = uint(attributes.a_position.w); \n\
+   return varyings; \n\
+}" encoding: NSASCIIStringEncoding];
+    
+    NSMutableString* clearFrag = [NSMutableString alloc];
+    [clearFrag appendString: @"\
+     #include <metal_stdlib> \n\
+     using namespace metal; \n\
+     typedef struct { \n\
+     float4 v_position [[position]]; \n\
+     } VaryingsPos; \n\
+     typedef struct { \n\
+     float4 colors[16]; \n\
+     } ClearColorsIn; \n\
+     typedef struct { \n\
+     "];
+    for(uint32_t i = 0; i < numFormats; i++) {
+        [clearFrag appendFormat: @"float4 color%u [[color(%u)]];", i, desc[i].colorAttachmentIndex];
+    }
+    [clearFrag appendString: @"\
+    } ClearColorsOut; \n\
+    fragment ClearColorsOut fragClear(VaryingsPos varyings [[stage_in]], constant ClearColorsIn& ccIn [[buffer(0)]]) { \n\
+    ClearColorsOut ccOut; \n"];
+    for(uint32_t i = 0; i < numFormats; i++) {
+        [clearFrag appendFormat: @"ccOut.color%u = float4(ccIn.colors[%u]);", i, i];
+    }
+    [clearFrag appendString: @"\
+return ccOut;\n\
+}"];
+    
+    id<MTLFunction> vtxFunc = initShaderFromSource(m_Device, clearVert, @"vertClear");
+    id<MTLFunction> fragFunc = initShaderFromSource(m_Device, clearFrag, @"fragClear");
+    MTLRenderPipelineDescriptor* renderPipelineDesc = [MTLRenderPipelineDescriptor new];    // temp retain
+    //    owner->setMetalObjectLabel(plDesc, @"ClearRenderAttachments");
+    renderPipelineDesc.vertexFunction = vtxFunc;
+    renderPipelineDesc.fragmentFunction = fragFunc;
+    //    plDesc.sampleCount = 1;
+    renderPipelineDesc.inputPrimitiveTopology = MTLPrimitiveTopologyClassTriangle;
+    
+    MTLVertexDescriptor* vtxDesc = renderPipelineDesc.vertexDescriptor;
+    
+    MTLVertexAttributeDescriptorArray* vaDescArray = vtxDesc.attributes;
+    MTLVertexAttributeDescriptor* vaDesc;
+    NSUInteger vtxBuffIdx = 0;
+    NSUInteger vtxStride = 0;
+    
+    // Vertex location
+    vaDesc = vaDescArray[0];
+    vaDesc.format = MTLVertexFormatFloat4;
+    vaDesc.bufferIndex = vtxBuffIdx;
+    vaDesc.offset = vtxStride;
+    vtxStride += sizeof(simd::float4);
+    
+    // Vertex attribute buffer.
+    MTLVertexBufferLayoutDescriptorArray* vbDescArray = vtxDesc.layouts;
+    MTLVertexBufferLayoutDescriptor* vbDesc = vbDescArray[vtxBuffIdx];
+    vbDesc.stepFunction = MTLVertexStepFunctionPerVertex;
+    vbDesc.stepRate = 1;
+    vbDesc.stride = vtxStride;
+    
+    NSError* error = nil;
+    id <MTLRenderPipelineState> rps = [m_Device newRenderPipelineStateWithDescriptor:renderPipelineDesc error: &error];
+    
+    [vtxFunc release];                                                            // temp release
+    [fragFunc release];                                                            // temp release
+    [renderPipelineDesc release];                                                            // temp release
     
+    return rps;
 }
 
 
diff --git a/Source/Metal/ImplMTL.mm b/Source/Metal/ImplMTL.mm
@@ -17,6 +17,8 @@
 #include "HelperDeviceMemoryAllocator.h"
 #include "CommandQueueMTL.h"
 #include "SwapChainMTL.h"
+#include "FenceMTL.h"
+#include "DescriptorPoolMTL.h"
 
 
 Result CreateDeviceMTL(const DeviceCreationDesc& desc, DeviceBase*& device) {
@@ -70,9 +72,13 @@ static Result NRI_CALL CreateCommandBuffer(CommandAllocator& commandAllocator, C
     return ((CommandAllocatorMTL&)commandAllocator).CreateCommandBuffer(commandBuffer);
 }
 
+
+static Result NRI_CALL CreateDescriptorPool(Device& device, const DescriptorPoolDesc& descriptorPoolDesc, DescriptorPool*& descriptorPool) {
+    return ((DeviceMTL&)device).CreateImplementation<DescriptorPoolMTL>(descriptorPool, descriptorPoolDesc);
+}
+
 static void NRI_CALL ResetCommandAllocator(CommandAllocator& commandAllocator) {
-   // ((CommandAllocatorVK&)commandAllocator).Reset();
-    
+    ((CommandAllocatorMTL&)commandAllocator).Reset();
 }
 
 static void NRI_CALL SetCommandBufferDebugName(CommandBuffer& commandBuffer, const char* name) {
@@ -219,6 +225,11 @@ static void NRI_CALL CmdResolveTexture(CommandBuffer& commandBuffer, Texture& ds
     //((CommandBufferMTL&)commandBuffer).ResolveTexture(dstTexture, dstRegionDesc, srcTexture, srcRegionDesc);
 }
 
+
+static void NRI_CALL Wait(Fence& fence, uint64_t value) {
+    ((FenceMTL&)fence).Wait(value);
+}
+
 static void NRI_CALL CmdCopyBuffer(CommandBuffer& commandBuffer, Buffer& dstBuffer, uint64_t dstOffset, const Buffer& srcBuffer, uint64_t srcOffset, uint64_t size) {
     ((CommandBufferMTL&)commandBuffer).CopyBuffer(dstBuffer, dstOffset, srcBuffer, srcOffset, size);
 }
@@ -265,31 +276,46 @@ static Result NRI_CALL CreateTexture(Device& device, const TextureDesc& textureD
     return ((DeviceMTL&)device).CreateImplementation<TextureMTL>(texture, textureDesc);
 }
 
+static Result NRI_CALL CreateCommandAllocator(const CommandQueue& commandQueue, CommandAllocator*& commandAllocator) {
+    DeviceMTL& device = ((CommandQueueMTL&)commandQueue).GetDevice();
+    return device.CreateImplementation<CommandAllocatorMTL>(commandAllocator, commandQueue);
+}
 
-//static Result NRI_CALL CreateBufferView(const BufferViewDesc& bufferViewDesc, Descriptor*& bufferView) {
-//    DeviceMTL& device = ((const BufferMTL*)bufferViewDesc.buffer)->GetDevice();
-//    return device.CreateImplementation<DescriptorMTL>(bufferView, bufferViewDesc);
-//}
-//
-//static Result NRI_CALL CreateTexture1DView(const Texture1DViewDesc& textureViewDesc, Descriptor*& textureView) {
-//    DeviceMTL& device = ((const TextureMTL*)textureViewDesc.texture)->GetDevice();
-//    return device.CreateImplementation<DescriptorMTL>(textureView, textureViewDesc);
-//}
-//
-//static Result NRI_CALL CreateTexture2DView(const Texture2DViewDesc& textureViewDesc, Descriptor*& textureView) {
-//    DeviceMTL& device = ((const TextureMTL*)textureViewDesc.texture)->GetDevice();
-//    return device.CreateImplementation<DescriptorMTL>(textureView, textureViewDesc);
-//}
-//
-//static Result NRI_CALL CreateTexture3DView(const Texture3DViewDesc& textureViewDesc, Descriptor*& textureView) {
-//    DeviceMTL& device = ((const TextureMTL*)textureViewDesc.texture)->GetDevice();
-//    return device.CreateImplementation<DescriptorMTL>(textureView, textureViewDesc);
-//}
+static Result NRI_CALL CreateBufferView(const BufferViewDesc& bufferViewDesc, Descriptor*& bufferView) {
+    DeviceMTL& device = ((const BufferMTL*)bufferViewDesc.buffer)->GetDevice();
+    return device.CreateImplementation<DescriptorMTL>(bufferView, bufferViewDesc);
+}
 
+static Result NRI_CALL CreateBuffer(Device& device, const BufferDesc& bufferDesc, Buffer*& buffer) {
+    return ((DeviceMTL&)device).CreateImplementation<BufferMTL>(buffer, bufferDesc);
+}
 
-//static void NRI_CALL QueueSubmit(CommandQueue& commandQueue, const QueueSubmitDesc& workSubmissionDesc) {
-//    ((CommandQueueMTL&)commandQueue).Submit(workSubmissionDesc, nullptr);
-//}
+static Result NRI_CALL CreateTexture1DView(const Texture1DViewDesc& textureViewDesc, Descriptor*& textureView) {
+    DeviceMTL& device = ((const TextureMTL*)textureViewDesc.texture)->GetDevice();
+    return device.CreateImplementation<DescriptorMTL>(textureView, textureViewDesc);
+}
+
+static Result NRI_CALL CreateTexture2DView(const Texture2DViewDesc& textureViewDesc, Descriptor*& textureView) {
+    DeviceMTL& device = ((const TextureMTL*)textureViewDesc.texture)->GetDevice();
+    return device.CreateImplementation<DescriptorMTL>(textureView, textureViewDesc);
+}
+
+static Result NRI_CALL CreateTexture3DView(const Texture3DViewDesc& textureViewDesc, Descriptor*& textureView) {
+    DeviceMTL& device = ((const TextureMTL*)textureViewDesc.texture)->GetDevice();
+    return device.CreateImplementation<DescriptorMTL>(textureView, textureViewDesc);
+}
+
+static Result NRI_CALL CreateSampler(Device& device, const SamplerDesc& samplerDesc, Descriptor*& sampler) {
+    return ((DeviceMTL&)device).CreateImplementation<DescriptorMTL>(sampler, samplerDesc);
+}
+
+static Result NRI_CALL CreatePipelineLayout(Device& device, const PipelineLayoutDesc& pipelineLayoutDesc, PipelineLayout*& pipelineLayout) {
+    return ((DeviceMTL&)device).CreateImplementation<PipelineLayoutMTL>(pipelineLayout, pipelineLayoutDesc);
+}
+
+static void NRI_CALL QueueSubmit(CommandQueue& commandQueue, const QueueSubmitDesc& workSubmissionDesc) {
+    ((CommandQueueMTL&)commandQueue).Submit(workSubmissionDesc, nullptr);
+}
 
 
 static void NRI_CALL DestroyCommandBuffer(CommandBuffer& commandBuffer) {
@@ -389,8 +415,11 @@ static Result NRI_CALL CreateComputePipeline(Device& device, const ComputePipeli
 
 
 static Result NRI_CALL AllocateDescriptorSets(DescriptorPool& descriptorPool, const PipelineLayout& pipelineLayout, uint32_t setIndex, DescriptorSet** descriptorSets, uint32_t instanceNum, uint32_t variableDescriptorNum) {
-    return Result::SUCCESS;
-    //return ((DescriptorPoolMTL&)descriptorPool).AllocateDescriptorSets(pipelineLayout, setIndex, descriptorSets, instanceNum, variableDescriptorNum);
+    return ((DescriptorPoolMTL&)descriptorPool).AllocateDescriptorSets(pipelineLayout, setIndex, descriptorSets, instanceNum, variableDescriptorNum);
+}
+
+static void NRI_CALL ResetDescriptorPool(DescriptorPool& descriptorPool) {
+    ((DescriptorPoolMTL&)descriptorPool).Reset();
 }
 
 
@@ -408,20 +437,19 @@ static void NRI_CALL SetDescriptorDebugName(Descriptor& descriptor, const char*
     table.GetBufferMemoryDesc = ::GetBufferMemoryDesc;
     table.GetTextureMemoryDesc = ::GetTextureMemoryDesc;
     table.GetCommandQueue = ::GetCommandQueue;
-    //table.CreateCommandAllocator = ::CreateCommandAllocator;
+    table.CreateCommandAllocator = ::CreateCommandAllocator;
     table.CreateCommandBuffer = ::CreateCommandBuffer;
-    //table.CreateDescriptorPool = ::CreateDescriptorPool;
-    //table.CreateBuffer = ::CreateBuffer;
+    table.CreateDescriptorPool = ::CreateDescriptorPool;
+    table.CreateBuffer = ::CreateBuffer;
     table.CreateTexture = ::CreateTexture;
-    //table.CreateBufferView = ::CreateBufferView;
-    //table.CreateTexture1DView = ::CreateTexture1DView;
-    //table.CreateTexture2DView = ::CreateTexture2DView;
-    //table.CreateTexture3DView = ::CreateTexture3DView;
-    //table.CreateSampler = ::CreateSampler;
-    //table.CreatePipelineLayout = ::CreatePipelineLayout;
+    table.CreateBufferView = ::CreateBufferView;
+    table.CreateTexture1DView = ::CreateTexture1DView;
+    table.CreateTexture2DView = ::CreateTexture2DView;
+    table.CreateTexture3DView = ::CreateTexture3DView;
+    table.CreateSampler = ::CreateSampler;
+    table.CreatePipelineLayout = ::CreatePipelineLayout;
     table.CreateGraphicsPipeline = ::CreateGraphicsPipeline;
     table.CreateComputePipeline = ::CreateComputePipeline;
-    
 //    table.CreateQueryPool = ::CreateQueryPool;
 //    table.CreateFence = ::CreateFence;
     table.DestroyCommandAllocator = ::DestroyCommandAllocator;
@@ -479,14 +507,14 @@ static void NRI_CALL SetDescriptorDebugName(Descriptor& descriptor, const char*
     table.CmdBeginAnnotation = ::CmdBeginAnnotation;
     table.CmdEndAnnotation = ::CmdEndAnnotation;
     table.EndCommandBuffer = ::EndCommandBuffer;
-//    table.QueueSubmit = ::QueueSubmit;
-//    table.Wait = ::Wait;
+    table.QueueSubmit = ::QueueSubmit;
+    table.Wait = ::Wait;
 //    table.GetFenceValue = ::GetFenceValue;
 //    table.UpdateDescriptorRanges = ::UpdateDescriptorRanges;
 //    table.UpdateDynamicConstantBuffers = ::UpdateDynamicConstantBuffers;
 //    table.CopyDescriptorSet = ::CopyDescriptorSet;
     table.AllocateDescriptorSets = ::AllocateDescriptorSets;
-//    table.ResetDescriptorPool = ::ResetDescriptorPool;
+    table.ResetDescriptorPool = ::ResetDescriptorPool;
     table.ResetCommandAllocator = ::ResetCommandAllocator;
     table.MapBuffer = ::MapBuffer;
     table.UnmapBuffer = ::UnmapBuffer;

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@`
`39`	`39`
`40`	`40`	`}`
`41`	`41`	`void DescriptorPoolMTL::Reset() {`
	`42`	`+ m_ArgumentOffset = 0;`
	`43`	`+ m_AllocatedSets.clear();`
`42`	`44`
`43`	`45`	`}`
`44`	`46`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ struct DeviceMTL final : public DeviceBase {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`
`56`		`- id<MTLRenderPipelineState> GetClearPipeline();`
	`56`	`+ id<MTLRenderPipelineState> GetClearPipeline(ClearDesc* desc, size_t numFormat);`
`57`	`57`
`58`	`58`	`void Destruct() override;`
`59`	`59`	`Result FillFunctionTable(CoreInterface& table) const override;`