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.

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

[Metal] Implement Xcode 16 RC changes. #21229

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions src/metal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5553,49 +5553,49 @@ interface MTLIndirectRenderCommand {
[Export ("setVertexBuffer:offset:attributeStride:atIndex:")]
void SetVertexBuffer (IMTLBuffer buffer, nuint offset, nuint stride, nuint index);

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
[Export ("setObjectThreadgroupMemoryLength:atIndex:")]
void SetObjectThreadgroupMemoryLength (nuint length, nuint index);

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
[Export ("setObjectBuffer:offset:atIndex:")]
void SetObjectBuffer (IMTLBuffer buffer, nuint offset, nuint index);

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
[Export ("setMeshBuffer:offset:atIndex:")]
void SetMeshBuffer (IMTLBuffer buffer, nuint offset, nuint index);

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
[Export ("drawMeshThreadgroups:threadsPerObjectThreadgroup:threadsPerMeshThreadgroup:")]
void DrawMeshThreadgroups (MTLSize threadgroupsPerGrid, MTLSize threadsPerObjectThreadgroup, MTLSize threadsPerMeshThreadgroup);

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
[Export ("drawMeshThreads:threadsPerObjectThreadgroup:threadsPerMeshThreadgroup:")]
void DrawMeshThreads (MTLSize threadsPerGrid, MTLSize threadsPerObjectThreadgroup, MTLSize threadsPerMeshThreadgroup);

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
[Export ("setBarrier")]
void SetBarrier ();

[Mac (14, 0), iOS (17, 0), NoTV, MacCatalyst (17, 0)]
[Mac (14, 0), iOS (17, 0), TV (18, 0), MacCatalyst (17, 0)]
#if NET
[Abstract (GenerateExtensionMethod = true)]
#endif
Expand Down Expand Up @@ -6170,7 +6170,7 @@ interface MTLAccelerationStructureTriangleGeometryDescriptor {
[Export ("transformationMatrixBufferOffset")]
nuint TransformationMatrixBufferOffset { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("transformationMatrixLayout")]
MTLMatrixLayout TransformationMatrixLayout { get; set; }
}
Expand Down Expand Up @@ -6347,15 +6347,15 @@ interface MTLInstanceAccelerationStructureDescriptor {
[Export ("motionTransformCount")]
nuint MotionTransformCount { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("instanceTransformationMatrixLayout")]
MTLMatrixLayout InstanceTransformationMatrixLayout { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("motionTransformType")]
MTLTransformType MotionTransformType { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("motionTransformStride")]
nuint MotionTransformStride { get; set; }
}
Expand Down Expand Up @@ -6949,7 +6949,7 @@ interface MTLAccelerationStructureMotionTriangleGeometryDescriptor {
[Export ("transformationMatrixBufferOffset")]
nuint TransformationMatrixBufferOffset { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("transformationMatrixLayout")]
MTLMatrixLayout TransformationMatrixLayout { get; set; }
}
Expand Down Expand Up @@ -7222,15 +7222,15 @@ interface MTLIndirectInstanceAccelerationStructureDescriptor {
[Export ("descriptor")]
MTLIndirectInstanceAccelerationStructureDescriptor GetDescriptor ();

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("instanceTransformationMatrixLayout")]
MTLMatrixLayout InstanceTransformationMatrixLayout { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("motionTransformType")]
MTLTransformType MotionTransformType { get; set; }

[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), NoTV]
[Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0), TV (18, 0)]
[Export ("motionTransformStride")]
nuint MotionTransformStride { get; set; }
}
Expand Down Expand Up @@ -7376,14 +7376,14 @@ interface MTLThreadgroupBinding : MTLBinding {
}

[Native]
[Mac (15, 0), NoTV, iOS (18, 0), MacCatalyst (18, 0)]
[Mac (15, 0), TV (18, 0), iOS (18, 0), MacCatalyst (18, 0)]
enum MTLMatrixLayout : long {
ColumnMajor = 0,
RowMajor = 1,
}

[Native]
[Mac (15, 0), NoTV, iOS (18, 0), MacCatalyst (18, 0)]
[Mac (15, 0), TV (18, 0), iOS (18, 0), MacCatalyst (18, 0)]
enum MTLTransformType : long {
PackedFloat4x3 = 0,
Component = 1,
Expand Down
25 changes: 0 additions & 25 deletions tests/xtro-sharpie/api-annotations-dotnet/tvOS-Metal.todo

This file was deleted.