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.

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!

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

dzhdanNV · 2024-11-15T01:55:25Z

Thanks for the progress. Very appreciated.

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

pollend · 2024-11-29T17:29:45Z

so i guess you encode the data to an argument buffer. I guess to reproduce descriptor sets the pool would allocate an argument buffer for n number of descriptor sets?

fragmentShader(       RasterizerData            in                 [[ stage_in ]],
               device FragmentShaderArguments & fragmentShaderArgs [[ buffer(AAPLFragmentBufferIndexArguments) ]])

dzhdanNV · 2024-11-30T11:22:48Z

To be honest I don't follow. Please, explain the problem and a solution. Is the question about indirect drawing or something else?

vertver · 2024-11-30T11:37:13Z

I guess to reproduce descriptor sets the pool would allocate an argument buffer for n number of descriptor sets?

Correct. Metal requires to fill argument buffers even for non-indirect draw calls, so you need to store descriptors in it.

pollend · 2024-12-01T03:11:07Z

any clue how these properties line up with DescriptorRangeDesc?
https://developer.apple.com/documentation/metal/mtlargumentdescriptor?language=objc

for(size_t r = 0; r < descriptorSetDesc.rangeNum; r++) {
            MTLArgumentDescriptor* argDescriptor = [MTLArgumentDescriptor argumentDescriptor];
            const DescriptorRangeDesc* range = &descriptorSetDesc.ranges[r];
            argDescriptor.arrayLength = range->descriptorNum;
            argDescriptor.access = MTLBindingAccessReadWrite;
            argDescriptor.index = range->baseRegisterIndex;
            switch(range->descriptorType) {
                case DescriptorType::TEXTURE:
                    argDescriptor.dataType = MTLDataTypeTexture;
                    argDescriptor.textureType = MTLTextureType2D; // descriptor type does not have this
                    break;
                case DescriptorType::SAMPLER:
                    argDescriptor.dataType = MTLDataTypeSampler;
                    break;
                case DescriptorType::CONSTANT_BUFFER:
                case DescriptorType::STORAGE_TEXTURE:
                case DescriptorType::BUFFER:
                case DescriptorType::STORAGE_BUFFER:
                case DescriptorType::STRUCTURED_BUFFER:
                case DescriptorType::STORAGE_STRUCTURED_BUFFER:
                    argDescriptor.dataType = MTLDataTypeStruct;
                    break;
                case DescriptorType::ACCELERATION_STRUCTURE:
                    argDescriptor.dataType = MTLDataTypePrimitiveAccelerationStructure;
                    break;
            }
        }

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

dzhdanNV · 2024-12-02T02:31:02Z

An obvious suggestion: you can look at MoltenVK sources and work this way:

NRI => open NRI/VK => open corresponding place in MoltenVK => analyze, rearrange, copy & paste to MTL implementation

(looking at MTL docs...)

pollend · 2024-12-02T02:44:59Z

An obvious suggestion: you can look at MoltenVK sources and work this way:
NRI => open NRI/VK => open corresponding place in MoltenVK => analyze, rearrange, copy & paste to MTL implementation
(looking at MTL docs...)

I've been looking at the MoltenVK source, thanks for the suggestion. umm, ill have to do a bit of research i don't want to have to extend DescriptorType. maybe there is a more ideal solution?

dzhdanNV · 2024-12-02T03:11:56Z

Why do you need to potentially extend DescriptorType? Because of this:

                case DescriptorType::TEXTURE:
                    argDescriptor.dataType = MTLDataTypeTexture;
                    argDescriptor.textureType = MTLTextureType2D; // descriptor type does not have this
                    break;

?

pollend · 2024-12-02T05:38:42Z

Why do you need to potentially extend DescriptorType? Because of this:

                case DescriptorType::TEXTURE:
                    argDescriptor.dataType = MTLDataTypeTexture;
                    argDescriptor.textureType = MTLTextureType2D; // descriptor type does not have this
                    break;

?

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

defines 1D/1DArray/2D/2dArray/Cube/CubeArray etc ... ill have to see NRISamples when I get there. just something to note later on. Ummm, I still need to finish metal cmd buffers.

vertver · 2024-12-02T05:45:08Z

You can do the same trick as here -

NRI/Source/D3D11/DescriptorD3D11.hpp

Line 55 in 205cf05

switch (textureViewDesc.viewType) {

Just identify your texture type by texture parameters, that's all you need.

pollend · 2024-12-02T05:54:00Z

You can do the same trick as here -

NRI/Source/D3D11/DescriptorD3D11.hpp

Line 55 in 205cf05

switch (textureViewDesc.viewType) {

Just identify your texture type by texture parameters, that's all you need.

in what way?

vertver · 2024-12-02T05:57:06Z

AFAIK, MTLTextureDescriptor is a direct analogue of NriDescriptor, so it shouldn't be hard to identify the texture type when creating the descriptor. If I'm right, you can use TextureViewType to identify the MTLTextureType.

dzhdanNV · 2024-12-02T05:59:39Z

The problem is that there are no descriptors in DescriptorRangeDesc. In other places - yes. In this and hopefully the only one place - no.

vertver · 2024-12-02T06:03:52Z

https://github.com/KhronosGroup/MoltenVK/blob/1d2ec638532268d076a550262df2e5e5e4fd2c9e/MoltenVK/MoltenVK/GPUObjects/MVKDescriptorSet.mm#L1146C43-L1146C67
This type doesn't seem to be very important, as it's only used for size calculations.

Same here - https://github.com/KhronosGroup/MoltenVK/blob/1d2ec638532268d076a550262df2e5e5e4fd2c9e/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.mm#L486

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 force-pushed the feature/apple-metal-support branch from b2f4953 to 56f38db Compare October 1, 2024 20:04

pollend added 18 commits November 13, 2024 19:49

feat: apple support

a28bda0

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

feat: add templte classes

5d5d8f3

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

feat: add command queue mtl

457200c

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

add ds_store

bd20ca5

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

feat: update commanQueuMTL

5838a59

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

feat: add conversion and start texture

e1a2156

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

feat: add more to api

3ef604e

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

feat: fix build

7c07c32

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

feat: add graphics queu

7e45361

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

feat: add interface

45462cf

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

feat: add descriptor

07ed0fe

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

fix compiling errors

417d6b2

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

feat: start on command buffer logic

0a7e5b1

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

add command buffer type

3d0b300

start working on command buffer

5cdb7e0

feat: begin shader load logic

2c3918e

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

fix compiling errors

f0de1b2

feat: cleanup

b027a75

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

pollend force-pushed the feature/apple-metal-support branch from b727121 to b027a75 Compare November 14, 2024 04:03

feat: fix compiling errors

5601601

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

pollend added 4 commits November 18, 2024 21:05

feat: update desciprot and textureo

b0ecb16

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

feat: add command buffer impl progress

d8e29d3

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

feat: add memory mtl

177fae3

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

feat: more progress

4b283c0

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

feat: add descriptor binding logic

b4079f3

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

dzhdanNV commented Nov 15, 2024

pollend commented Nov 29, 2024

dzhdanNV commented Nov 30, 2024

vertver commented Nov 30, 2024 •

edited

Loading

pollend commented Dec 1, 2024

dzhdanNV commented Dec 2, 2024

pollend commented Dec 2, 2024 •

edited

Loading

dzhdanNV commented Dec 2, 2024 •

edited

Loading

pollend commented Dec 2, 2024 •

edited

Loading

vertver commented Dec 2, 2024 •

edited

Loading

pollend commented Dec 2, 2024

vertver commented Dec 2, 2024 •

edited

Loading

dzhdanNV commented Dec 2, 2024

vertver commented Dec 2, 2024 •

edited

Loading

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

dzhdanNV commented Nov 15, 2024

pollend commented Nov 29, 2024

dzhdanNV commented Nov 30, 2024

vertver commented Nov 30, 2024 • edited Loading

pollend commented Dec 1, 2024

dzhdanNV commented Dec 2, 2024

pollend commented Dec 2, 2024 • edited Loading

dzhdanNV commented Dec 2, 2024 • edited Loading

pollend commented Dec 2, 2024 • edited Loading

vertver commented Dec 2, 2024 • edited Loading

pollend commented Dec 2, 2024

vertver commented Dec 2, 2024 • edited Loading

dzhdanNV commented Dec 2, 2024

vertver commented Dec 2, 2024 • edited Loading

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

vertver commented Nov 30, 2024 •

edited

Loading

pollend commented Dec 2, 2024 •

edited

Loading

dzhdanNV commented Dec 2, 2024 •

edited

Loading

pollend commented Dec 2, 2024 •

edited

Loading

vertver commented Dec 2, 2024 •

edited

Loading

vertver commented Dec 2, 2024 •

edited

Loading

vertver commented Dec 2, 2024 •

edited

Loading