feat: apple support #89

pollend · 2024-08-29T04:30:24Z

No description provided.

pollend · 2024-08-29T04:30:56Z

Source/Metal/DeviceMetal.mm

+  if (strstr(m_Desc.adapterDesc.name, "Apple"))
+  {
+      m_Desc.adapterDesc.vendor = nri::Vendor::APPLE;
+  } else {
+      const uint64_t regID = [m_Device registryID];
+      if (regID)
+      {
+          io_registry_entry_t entry = IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(regID));
+          if (entry)
+          {
+              // That returned the IOGraphicsAccelerator nub. Its parent, then, is the actual PCI device.
+              io_registry_entry_t parent;
+              if (IORegistryEntryGetParentEntry(entry, kIOServicePlane, &parent) == kIOReturnSuccess)
+              {
+                  m_Desc.adapterDesc.vendor = GetVendorFromID(GetEntryProperty(parent, CFSTR("vendor-id")));
+                  m_Desc.adapterDesc.deviceId = GetEntryProperty(parent, CFSTR("device-id"));
+                  IOObjectRelease(parent);
+              }
+              IOObjectRelease(entry);
+          }
+      }
+  }


something interesting, I guess apple doesn't report the device/vendor.

"Apple": { "id": "0x106b", "_comment": [ "Apple GPUs do not report a DeviceID via the Metal API, and as such the typical device", "pattern matching does not work for them. The recommended approach is to find the highest", "supported 'common' family supported and report it as the architecture.", "Examples: 'common-1', 'common-3'", "https://developer.apple.com/documentation/metal/gpu_devices_and_work_submission/detecting_gpu_features_and_metal_software_versions" ] },

I don't think it's a problem. Just do what Metal's layer says and just pass the single device.

pollend · 2024-09-02T00:33:45Z

Include/NRIDescs.h

+// defined in apple framework
+#undef INTEL
+#undef AMD


looks like these are #defined in apple framework.

I don't mind to add these undefs to the interface.

pollend · 2024-09-04T04:43:07Z

Source/Metal/ConversionMTL.h

+constexpr std::array<MTLDataType, (size_t)DescriptorType::MAX_NUM> DESCRIPTOR_TYPES = {
+    MTLDataTypeSampler, // SAMPLER
+    MTLDataTypeNone,    // CONSTANT_BUFFER
+    MTLDataTypeTexture, // TEXTURE
+    MTLDataTypeNone,    // STORAGE_TEXTURE
+    MTLDataTypeStruct,  // BUFFER
+    MTLDataTypeStruct,  // STORAGE_BUFFER
+    MTLDataTypeArray,   // STRUCTURED_BUFFER
+    MTLDataTypeStruct,    // STORAGE_STRUCTURED_BUFFER
+    MTLDataTypePrimitiveAccelerationStructure     // ACCELERATION_STRUCTURE
+};


not sure how this will work in practice.

pollend · 2024-09-05T23:55:27Z

@dzhdanNV just an observation you nearly have a pure C interface any reason for the C++ code to abstract across that. you can also just union a bunch of stuff together for dx12/dx11/vulkan/metal. You also have all this logic to build tables of functions etc ... avoid having to use a C++ so it should be easier to distribute. I guess you could just access that data based on the api.

struct CmdBuffer {
   union {
      struct {...}dx11;
      struct {...}dx12;
      struct {...}metal;
   };
}

struct NriDevice {
   union {
      struct {...}dx11;
      struct {...}dx12;
      struct {...}metal;
   };
   int (*Method1)(NriDevice*...);
}

pollend · 2024-09-06T14:53:38Z

Source/Metal/CommandBufferMTL.mm

+                       indexBufferOffset: m_CurrentIndexCmd.m_Offset];
+}
+void CommandBufferMTL::DrawIndirect(const Buffer& buffer, uint64_t offset, uint32_t drawNum, uint32_t stride, const Buffer* countBuffer, uint64_t countBufferOffset) {}
+void CommandBufferMTL::DrawIndexedIndirect(const Buffer& buffer, uint64_t offset, uint32_t drawNum, uint32_t stride, const Buffer* countBuffer, uint64_t countBufferOffset) {}


looks like there isn't a count buffer implement provided by the encoder. https://developer.apple.com/documentation/metal/mtlrendercommandencoder/render_pass_drawing_commands?language=objc

Ping me when you're done with the base implementation, I'll try to get samples to work.

Also, argument buffers can be used to emulate root constants/push constants. But yes, you can also use it for count buffers

Also, argument buffers can be used to emulate root constants/push constants. But yes, you can also use it for count buffers

feel free to jump in if you know what to do, you can drop me a PR and i can merge it. still looking around at the metal docs and trying to roughly get something together, will take quite a bit there is a lot here to cover.

pollend · 2024-09-07T00:39:32Z

Source/Metal/CommandBufferMTL.mm

+Result CommandBufferMTL::Begin(const DescriptorPool* descriptorPool) {
+
+}
+Result CommandBufferMTL::End() {
+
+}
+void CommandBufferMTL::SetPipeline(const Pipeline& pipeline) {
+    if (m_CurrentPipeline == (PipelineMTL*)&pipeline)
+        return;
+    PipelineMTL& pipelineImpl = (PipelineMTL&)pipeline;
+    m_CurrentPipeline = &pipelineImpl;
+
+
+}


not sure how these will fit together i only know about encoder once the pipeline is set. the attachment is know only with BeginRendering

https://developer.apple.com/documentation/metal/mtlcommandencoder

I have something rough for this CommandBufferMTL. hopefully I can get something rough.

pollend · 2024-09-08T21:43:39Z

Source/Metal/CommandBufferMTL.mm

+                       indexBufferOffset: m_CurrentIndexCmd.m_Offset];
+}
+void CommandBufferMTL::DrawIndirect(const Buffer& buffer, uint64_t offset, uint32_t drawNum, uint32_t stride, const Buffer* countBuffer, uint64_t countBufferOffset) {}
+void CommandBufferMTL::DrawIndexedIndirect(const Buffer& buffer, uint64_t offset, uint32_t drawNum, uint32_t stride, const Buffer* countBuffer, uint64_t countBufferOffset) {}


Also, argument buffers can be used to emulate root constants/push constants. But yes, you can also use it for count buffers

feel free to jump in if you know what to do, you can drop me a PR and i can merge it. still looking around at the metal docs and trying to roughly get something together, will take quite a bit there is a lot here to cover.

Signed-off-by: Michael Pollind <[email protected]>

pollend · 2024-10-22T00:14:58Z

been busy with something else, I'll have to catch up to this once i finish up what i want to do with this game project im working on.

dzhdanNV · 2024-10-22T01:45:31Z

Sure, no prob. And tons of thanks for working on native Apple support!

pollend commented Aug 29, 2024

View reviewed changes

pollend mentioned this pull request Aug 29, 2024

Metal Support #88

Open

pollend force-pushed the feature/apple-metal-support branch from 20992dc to a5806a5 Compare August 30, 2024 15:08

pollend commented Sep 2, 2024

View reviewed changes

pollend commented Sep 4, 2024

View reviewed changes

pollend force-pushed the feature/apple-metal-support branch from 69abd41 to 51a6f96 Compare September 5, 2024 04:59

pollend commented Sep 6, 2024

View reviewed changes

pollend commented Sep 9, 2024

View reviewed changes

pollend added 17 commits October 1, 2024 10:39

feat: apple support

7014d7f

Signed-off-by: Michael Pollind <[email protected]>

feat: add templte classes

1db2c0a

Signed-off-by: Michael Pollind <[email protected]>

feat: add command queue mtl

8a5b5d8

Signed-off-by: Michael Pollind <[email protected]>

add ds_store

d2acc0e

Signed-off-by: Michael Pollind <[email protected]>

feat: update commanQueuMTL

6ecdb4f

Signed-off-by: Michael Pollind <[email protected]>

feat: add conversion and start texture

a123c5d

Signed-off-by: Michael Pollind <[email protected]>

feat: add more to api

b769e9e

Signed-off-by: Michael Pollind <[email protected]>

feat: fix build

3505ba1

Signed-off-by: Michael Pollind <[email protected]>

feat: add graphics queu

346beb2

Signed-off-by: Michael Pollind <[email protected]>

feat: add interface

ab5a362

Signed-off-by: Michael Pollind <[email protected]>

feat: add descriptor

7aad81d

Signed-off-by: Michael Pollind <[email protected]>

fix compiling errors

ada4491

Signed-off-by: Michael Pollind <[email protected]>

feat: start on command buffer logic

0818af8

Signed-off-by: Michael Pollind <[email protected]>

add command buffer type

07f9b2d

start working on command buffer

0697e07

feat: begin shader load logic

8868d96

Signed-off-by: Michael Pollind <[email protected]>

fix compiling errors

56f38db

pollend force-pushed the feature/apple-metal-support branch from b2f4953 to 56f38db Compare October 1, 2024 20:04

feat: cleanup

b727121

Signed-off-by: Michael Pollind <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: apple support #89

feat: apple support #89

pollend commented Aug 29, 2024

pollend Aug 29, 2024 •

edited

Loading

vertver Aug 29, 2024 •

edited

Loading

pollend Sep 2, 2024

dzhdanNV Sep 5, 2024

pollend Sep 4, 2024

pollend commented Sep 5, 2024 •

edited

Loading

pollend Sep 6, 2024

vertver Sep 6, 2024

vertver Sep 6, 2024

pollend Sep 8, 2024 •

edited

Loading

pollend Sep 7, 2024

pollend Sep 7, 2024

pollend Sep 8, 2024 •

edited

Loading

pollend commented Oct 22, 2024

dzhdanNV commented Oct 22, 2024

feat: apple support #89

Are you sure you want to change the base?

feat: apple support #89

Conversation

pollend commented Aug 29, 2024

pollend Aug 29, 2024 • edited Loading

Choose a reason for hiding this comment

vertver Aug 29, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pollend commented Sep 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pollend Sep 8, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pollend Sep 8, 2024 • edited Loading

Choose a reason for hiding this comment

pollend commented Oct 22, 2024

dzhdanNV commented Oct 22, 2024

pollend Aug 29, 2024 •

edited

Loading

vertver Aug 29, 2024 •

edited

Loading

pollend commented Sep 5, 2024 •

edited

Loading

pollend Sep 8, 2024 •

edited

Loading

pollend Sep 8, 2024 •

edited

Loading