Skip to content

[GLKit] Fix nullability for GLKMesh.FromAssets. #24498

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

Merged
rolfbjarne merged 1 commit into from
Jan 14, 2026
+4 −8
Merged

[GLKit] Fix nullability for GLKMesh.FromAssets. #24498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/GLKit/GLKMesh.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ public partial class GLKMesh {
/// <summary>To be added.</summary>
/// <returns>To be added.</returns>
/// <remarks>To be added.</remarks>
public static GLKMesh []? FromAsset (MDLAsset asset, out MDLMesh [] sourceMeshes, out NSError error)
public static GLKMesh []? FromAsset (MDLAsset asset, out MDLMesh []? sourceMeshes, out NSError? error)
{
NSArray aret;

var ret = FromAsset (asset, out aret, out error);
var ret = FromAsset (asset, out NSArray? aret, out error);
sourceMeshes = NSArray.FromArray<MDLMesh> (aret);
return ret;
}
Expand Down
3 changes: 2 additions & 1 deletion src/glkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,8 @@ interface GLKMesh {
[Static]
[Export ("newMeshesFromAsset:sourceMeshes:error:")]
[return: NullAllowed]
GLKMesh [] FromAsset (MDLAsset asset, out NSArray sourceMeshes, out NSError error);
[return: Release]
GLKMesh [] FromAsset (MDLAsset asset, [NullAllowed] out NSArray sourceMeshes, [NullAllowed] out NSError error);

/// <summary>To be added.</summary>
/// <value>To be added.</value>
Expand Down
1 change: 0 additions & 1 deletion tests/xtro-sharpie/api-annotations-dotnet/iOS-GLKit.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
!missing-pinvoke! NSStringFromGLKVector4 is not bound

# Initial result from new rule missing-release-attribute-on-return-value
!missing-release-attribute-on-return-value! GLKit.GLKMesh[] GLKit.GLKMesh::FromAsset(ModelIO.MDLAsset,Foundation.NSArray&,Foundation.NSError&)'s selector's ('newMeshesFromAsset:sourceMeshes:error:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(Foundation.NSData,ModelIO.MDLMeshBufferType)'s selector's ('newBufferWithData:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(ModelIO.IMDLMeshBufferZone,Foundation.NSData,ModelIO.MDLMeshBufferType)'s selector's ('newBufferFromZone:data:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(ModelIO.IMDLMeshBufferZone,System.UIntPtr,ModelIO.MDLMeshBufferType)'s selector's ('newBufferFromZone:length:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
Expand Down
1 change: 0 additions & 1 deletion tests/xtro-sharpie/api-annotations-dotnet/macOS-GLKit.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
!missing-pinvoke! NSStringFromGLKVector4 is not bound

# Initial result from new rule missing-release-attribute-on-return-value
!missing-release-attribute-on-return-value! GLKit.GLKMesh[] GLKit.GLKMesh::FromAsset(ModelIO.MDLAsset,Foundation.NSArray&,Foundation.NSError&)'s selector's ('newMeshesFromAsset:sourceMeshes:error:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(Foundation.NSData,ModelIO.MDLMeshBufferType)'s selector's ('newBufferWithData:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(ModelIO.IMDLMeshBufferZone,Foundation.NSData,ModelIO.MDLMeshBufferType)'s selector's ('newBufferFromZone:data:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(ModelIO.IMDLMeshBufferZone,System.UIntPtr,ModelIO.MDLMeshBufferType)'s selector's ('newBufferFromZone:length:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
Expand Down
1 change: 0 additions & 1 deletion tests/xtro-sharpie/api-annotations-dotnet/tvOS-GLKit.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
!missing-pinvoke! NSStringFromGLKVector4 is not bound

# Initial result from new rule missing-release-attribute-on-return-value
!missing-release-attribute-on-return-value! GLKit.GLKMesh[] GLKit.GLKMesh::FromAsset(ModelIO.MDLAsset,Foundation.NSArray&,Foundation.NSError&)'s selector's ('newMeshesFromAsset:sourceMeshes:error:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(Foundation.NSData,ModelIO.MDLMeshBufferType)'s selector's ('newBufferWithData:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(ModelIO.IMDLMeshBufferZone,Foundation.NSData,ModelIO.MDLMeshBufferType)'s selector's ('newBufferFromZone:data:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
!missing-release-attribute-on-return-value! ModelIO.IMDLMeshBuffer GLKit.GLKMeshBufferAllocator::CreateBuffer(ModelIO.IMDLMeshBufferZone,System.UIntPtr,ModelIO.MDLMeshBufferType)'s selector's ('newBufferFromZone:length:type:') Objective-C method family ('new') indicates that the native method returns a retained object, and as such a '[return: Release]' attribute is required.
Expand Down
Loading