Skip to content

Adapt to nightly ccall changes #678

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
merged 2 commits into from
Oct 14, 2025
Merged

Adapt to nightly ccall changes #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed9caab
Adapt to nightly ccall changes
christiangnrd Oct 14, 2025
f14991d
Don't use bridgesupport versions
christiangnrd Oct 14, 2025
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
36 changes: 19 additions & 17 deletions lib/mtl/libmtl.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using CEnum: CEnum, @cenum

const libmtl = Symbol("/System/Library/Frameworks/Metal.framework/Metal")

const _NSRange = NSRange


Expand All @@ -23,7 +25,7 @@ struct MTLTextureSwizzleChannels
end

function MTLTextureSwizzleChannelsMake(r, g, b, a)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLTextureSwizzleChannelsMake(r::MTLTextureSwizzle, g::MTLTextureSwizzle, b::MTLTextureSwizzle, a::MTLTextureSwizzle)::MTLTextureSwizzleChannels
return @ccall libmtl.MTLTextureSwizzleChannelsMake(r::MTLTextureSwizzle, g::MTLTextureSwizzle, b::MTLTextureSwizzle, a::MTLTextureSwizzle)::MTLTextureSwizzleChannels
end

struct MTLOrigin
Expand All @@ -33,7 +35,7 @@ struct MTLOrigin
end

function MTLOriginMake(x, y, z)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLOriginMake(x::NSUInteger, y::NSUInteger, z::NSUInteger)::MTLOrigin
return @ccall libmtl.MTLOriginMake(x::NSUInteger, y::NSUInteger, z::NSUInteger)::MTLOrigin
end

struct MTLSize
Expand All @@ -43,7 +45,7 @@ struct MTLSize
end

function MTLSizeMake(width, height, depth)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLSizeMake(width::NSUInteger, height::NSUInteger, depth::NSUInteger)::MTLSize
return @ccall libmtl.MTLSizeMake(width::NSUInteger, height::NSUInteger, depth::NSUInteger)::MTLSize
end

struct MTLRegion
Expand All @@ -52,15 +54,15 @@ struct MTLRegion
end

function MTLRegionMake1D(x, width)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLRegionMake1D(x::NSUInteger, width::NSUInteger)::MTLRegion
return @ccall libmtl.MTLRegionMake1D(x::NSUInteger, width::NSUInteger)::MTLRegion
end

function MTLRegionMake2D(x, y, width, height)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLRegionMake2D(x::NSUInteger, y::NSUInteger, width::NSUInteger, height::NSUInteger)::MTLRegion
return @ccall libmtl.MTLRegionMake2D(x::NSUInteger, y::NSUInteger, width::NSUInteger, height::NSUInteger)::MTLRegion
end

function MTLRegionMake3D(x, y, z, width, height, depth)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLRegionMake3D(x::NSUInteger, y::NSUInteger, z::NSUInteger, width::NSUInteger, height::NSUInteger, depth::NSUInteger)::MTLRegion
return @ccall libmtl.MTLRegionMake3D(x::NSUInteger, y::NSUInteger, z::NSUInteger, width::NSUInteger, height::NSUInteger, depth::NSUInteger)::MTLRegion
end

struct MTLSamplePosition
Expand All @@ -69,13 +71,13 @@ struct MTLSamplePosition
end

function MTLSamplePositionMake(x, y)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLSamplePositionMake(x::Cfloat, y::Cfloat)::MTLSamplePosition
return @ccall libmtl.MTLSamplePositionMake(x::Cfloat, y::Cfloat)::MTLSamplePosition
end

const MTLCoordinate2D = MTLSamplePosition

function MTLCoordinate2DMake(x, y)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLCoordinate2DMake(x::Cfloat, y::Cfloat)::MTLCoordinate2D
return @ccall libmtl.MTLCoordinate2DMake(x::Cfloat, y::Cfloat)::MTLCoordinate2D
end

struct MTLResourceID
Expand Down Expand Up @@ -1346,7 +1348,7 @@ struct MTLClearColor
end

function MTLClearColorMake(red, green, blue, alpha)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLClearColorMake(red::Cdouble, green::Cdouble, blue::Cdouble, alpha::Cdouble)::MTLClearColor
return @ccall libmtl.MTLClearColorMake(red::Cdouble, green::Cdouble, blue::Cdouble, alpha::Cdouble)::MTLClearColor
end

@cenum MTLLoadAction::UInt64 begin
Expand Down Expand Up @@ -2373,7 +2375,7 @@ struct MTL4BufferRange
end

function MTL4BufferRangeMake(bufferAddress, length)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTL4BufferRangeMake(bufferAddress::MTLGPUAddress, length::UInt64)::MTL4BufferRange
return @ccall libmtl.MTL4BufferRangeMake(bufferAddress::MTLGPUAddress, length::UInt64)::MTL4BufferRange
end

struct _MTLPackedFloat3
Expand Down Expand Up @@ -2412,7 +2414,7 @@ end
const MTLPackedFloat3 = _MTLPackedFloat3

function MTLPackedFloat3Make(x, y, z)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLPackedFloat3Make(x::Cfloat, y::Cfloat, z::Cfloat)::MTLPackedFloat3
return @ccall libmtl.MTLPackedFloat3Make(x::Cfloat, y::Cfloat, z::Cfloat)::MTLPackedFloat3
end

struct MTLPackedFloatQuaternion
Expand All @@ -2423,7 +2425,7 @@ struct MTLPackedFloatQuaternion
end

function MTLPackedFloatQuaternionMake(x, y, z, w)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLPackedFloatQuaternionMake(x::Cfloat, y::Cfloat, z::Cfloat, w::Cfloat)::MTLPackedFloatQuaternion
return @ccall libmtl.MTLPackedFloatQuaternionMake(x::Cfloat, y::Cfloat, z::Cfloat, w::Cfloat)::MTLPackedFloatQuaternion
end

struct _MTLPackedFloat4x3
Expand Down Expand Up @@ -2991,7 +2993,7 @@ struct MTLIndirectCommandBufferExecutionRange
end

function MTLIndirectCommandBufferExecutionRangeMake(location, length)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLIndirectCommandBufferExecutionRangeMake(location::UInt32, length::UInt32)::MTLIndirectCommandBufferExecutionRange
return @ccall libmtl.MTLIndirectCommandBufferExecutionRangeMake(location::UInt32, length::UInt32)::MTLIndirectCommandBufferExecutionRange
end

@objcwrapper immutable = true MTLIndirectCommandBufferDescriptor <: NSObject
Expand Down Expand Up @@ -3269,19 +3271,19 @@ end
const MTLIOCompressionContext = Ptr{Cvoid}

function MTLIOCompressionContextDefaultChunkSize()
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLIOCompressionContextDefaultChunkSize()::Csize_t
return @ccall libmtl.MTLIOCompressionContextDefaultChunkSize()::Csize_t
end

function MTLIOCreateCompressionContext(path, type, chunkSize)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLIOCreateCompressionContext(path::Cstring, type::MTLIOCompressionMethod, chunkSize::Csize_t)::MTLIOCompressionContext
return @ccall libmtl.MTLIOCreateCompressionContext(path::Cstring, type::MTLIOCompressionMethod, chunkSize::Csize_t)::MTLIOCompressionContext
end

function MTLIOCompressionContextAppendData(context, data, size)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLIOCompressionContextAppendData(context::MTLIOCompressionContext, data::Ptr{Cvoid}, size::Csize_t)::Cvoid
return @ccall libmtl.MTLIOCompressionContextAppendData(context::MTLIOCompressionContext, data::Ptr{Cvoid}, size::Csize_t)::Cvoid
end

function MTLIOFlushAndDestroyCompressionContext(context)
return @ccall (Symbol("/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib")).MTLIOFlushAndDestroyCompressionContext(context::MTLIOCompressionContext)::MTLIOCompressionStatus
return @ccall libmtl.MTLIOFlushAndDestroyCompressionContext(context::MTLIOCompressionContext)::MTLIOCompressionStatus
end

@objcwrapper immutable = true availability = macos(v"15.0.0") MTLResidencySetDescriptor <: NSObject
Expand Down
2 changes: 1 addition & 1 deletion res/wrap/libmtl.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[general]
library_name = "Symbol(\"/System/Library/Frameworks/Metal.framework/Resources/BridgeSupport/Metal.dylib\")"
library_name = "libmtl"
output_file_path = "../../lib/mtl/libmtl.jl"
prologue_file_path = "libmtl_prologue.jl"

Expand Down
2 changes: 2 additions & 0 deletions res/wrap/libmtl_prologue.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
const libmtl = Symbol("/System/Library/Frameworks/Metal.framework/Metal")

const _NSRange = NSRange
4 changes: 2 additions & 2 deletions src/utilities.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function versioninfo(io::IO=stdout)
return
end

const _iokitlib = Symbol("/System/Library/Frameworks/IOKit.framework/Resources/BridgeSupport/IOKit.dylib")
const _cflib = Symbol("/System/Library/Frameworks/CoreFoundation.framework/Resources/BridgeSupport/CoreFoundation.dylib")
const _iokitlib = Symbol("/System/Library/Frameworks/IOKit.framework/IOKit")
const _cflib = Symbol("/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation")

@static if isdefined(Base, :OncePerProcess) # VERSION >= v"1.12.0-DEV.1421"
const num_gpu_cores = OncePerProcess{Int64}() do
Expand Down