Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Metal] Add support for Xcode15. #19379

Merged
merged 30 commits into from
Dec 12, 2023
Merged

[Metal] Add support for Xcode15. #19379

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2e76ac8
[Metal] Add support for Xcode15.
mandel-macaque Oct 4, 2023
56c5807
Add missing attrs.
mandel-macaque Nov 1, 2023
90fb766
Auto-format source code
Nov 1, 2023
ee94815
Apply suggestions from code review
mandel-macaque Nov 2, 2023
cf8a683
Address the following after reviews:
mandel-macaque Nov 3, 2023
6d14d66
Auto-format source code
Nov 3, 2023
fe75d75
Revert "Auto-format source code"
mandel-macaque Nov 6, 2023
1a66dd7
Revert "Address the following after reviews:"
mandel-macaque Nov 6, 2023
32548bc
Fix all the same issues as commit adddb22
mandel-macaque Nov 6, 2023
5631e8f
Fix issues with the MTLIOCompression Dispose.
mandel-macaque Nov 9, 2023
ca499ec
Auto-format source code
Nov 10, 2023
05199b2
Fix tests.
mandel-macaque Nov 10, 2023
f8c5ae9
Merge branch 'main' into net8.0-xcode15-metal
mandel-macaque Nov 15, 2023
0469142
Merge branch 'net8.0-xcode15-metal' of github.com:mandel-macaque/xama…
mandel-macaque Nov 15, 2023
3d622d5
Update src/Metal/MTLIOCompression.cs
mandel-macaque Nov 15, 2023
159e004
Fix the API changes on dotnet.
mandel-macaque Nov 16, 2023
570ed0e
Merge branch 'net8.0-xcode15-metal' of github.com:mandel-macaque/xama…
mandel-macaque Nov 16, 2023
6855ca7
Adress review.
mandel-macaque Nov 16, 2023
c3b5fb6
Apply suggestions from code review
mandel-macaque Nov 17, 2023
e1250f4
Auto-format source code
Nov 17, 2023
ce7f59d
Fix cecil test due to typo.
mandel-macaque Nov 20, 2023
93d8a82
Merge branch 'main' into net8.0-xcode15-metal
mandel-macaque Nov 20, 2023
7f971bb
Fix cecil and api changes.
mandel-macaque Nov 28, 2023
046fc63
Auto-format source code
Nov 28, 2023
b690584
Address reviews.
mandel-macaque Nov 28, 2023
be87e0a
Apply suggestions from code review
mandel-macaque Nov 29, 2023
a06dc04
Merge branch 'main' into net8.0-xcode15-metal
mandel-macaque Dec 1, 2023
535ba43
Remove those types that give issues compiling the static registrar.
mandel-macaque Dec 10, 2023
2dd8eb1
Fix tests on watchOS.
mandel-macaque Dec 11, 2023
f6a59cf
Provide correct native name.
mandel-macaque Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/Metal/Defs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,16 +492,18 @@ public struct MTLTextureSwizzleChannels {
#endif
}

#if IOS || MONOMAC || COREBUILD
#if IOS || MONOMAC || COREBUILD || TVOS

#if NET
[SupportedOSPlatform ("ios13.0")]
[SupportedOSPlatform ("maccatalyst13.4")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Introduced (PlatformName.iOS, 13,0, PlatformArchitecture.All)]
[Introduced (PlatformName.MacCatalyst, 13, 4)]
[Introduced (PlatformName.MacOSX, 10, 15, 4)]
[Introduced (PlatformName.TvOS, 16, 0)]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct MTLVertexAmplificationViewMapping {
Expand All @@ -514,10 +516,12 @@ public struct MTLVertexAmplificationViewMapping {
[SupportedOSPlatform ("ios13.0")]
[SupportedOSPlatform ("maccatalyst13.4")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos17.0")]
#else
[Introduced (PlatformName.iOS, 13,0, PlatformArchitecture.All)]
[Introduced (PlatformName.MacCatalyst, 13, 4)]
[Introduced (PlatformName.MacOSX, 10, 15, 4)]
[Introduced (PlatformName.TvOS, 17,0)]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct MTLCoordinate2D {
Expand All @@ -527,21 +531,16 @@ public struct MTLCoordinate2D {
}
#endif

#if !TVOS || !NET

#if NET
[SupportedOSPlatform ("maccatalyst14.0")]
[SupportedOSPlatform ("macos11.0")]
[SupportedOSPlatform ("ios14.0")]
[UnsupportedOSPlatform ("tvos")]
[SupportedOSPlatform ("tvos16.1")]
#else
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[MacCatalyst (14, 0)]
[Mac (11, 0)]
[iOS (14, 0)]
[NoTV]
#if TVOS
[Obsolete ("This API is not available on this platform.")]
#endif
[TV (16, 1)]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct MTLAccelerationStructureSizes {
Expand All @@ -551,5 +550,18 @@ public struct MTLAccelerationStructureSizes {

public nuint RefitScratchBufferSize;
}

#if NET
[SupportedOSPlatform ("ios16.0")]
[SupportedOSPlatform ("maccatalyst16.0")]
[SupportedOSPlatform ("macos13.0")]
[SupportedOSPlatform ("tvos16.0")]
#else
[Mac (13, 0), iOS (16, 0), TV (16, 0), MacCatalyst (16, 0), NoWatch]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct MTLResourceId {
public ulong Impl;
}

}
Loading
Loading