Adapt to strongly-typed id.

JuliaGPU · Mar 6, 2023 · fabf905 · fabf905
1 parent b1c2543
commit fabf905
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 38 deletions.
diff --git a/Manifest.toml b/Manifest.toml
@@ -157,7 +157,7 @@ version = "1.2.0"
 
 [[deps.ObjectiveC]]
 deps = ["Lazy", "MacroTools"]
-git-tree-sha1 = "e76cdd9b10873ac33830ccb59c826d4e22e575e6"
+git-tree-sha1 = "83ef9f60ccd5174ba74281fa4ac1a735a10cefc1"
 repo-rev = "tb/modernize"
 repo-url = "https://github.com/JuliaInterop/ObjectiveC.jl"
 uuid = "e86c9b32-1129-44ac-8ea0-90d5bb39ded9"

diff --git a/lib/cmt/libcmt.jl b/lib/cmt/libcmt.jl
@@ -749,31 +749,31 @@ struct MtMPSMatrixMultiplication
 end
 
 function mtErrorCode(err)
-    ccall((:mtErrorCode, libcmt), NsInteger, (id,), err)
+    ccall((:mtErrorCode, libcmt), NsInteger, (id{NSError},), err)
 end
 
 function mtErrorDomain(err)
-    ccall((:mtErrorDomain, libcmt), Cstring, (id,), err)
+    ccall((:mtErrorDomain, libcmt), Cstring, (id{NSError},), err)
 end
 
 function mtErrorUserInfo(err)
-    ccall((:mtErrorUserInfo, libcmt), Cstring, (id,), err)
+    ccall((:mtErrorUserInfo, libcmt), Cstring, (id{NSError},), err)
 end
 
 function mtErrorLocalizedDescription(err)
-    ccall((:mtErrorLocalizedDescription, libcmt), Cstring, (id,), err)
+    ccall((:mtErrorLocalizedDescription, libcmt), Cstring, (id{NSError},), err)
 end
 
 function mtErrorLocalizedRecoveryOptions(err, count, options)
-    ccall((:mtErrorLocalizedRecoveryOptions, libcmt), Ptr{Cstring}, (id, Ptr{Csize_t}, Ptr{Cstring}), err, count, options)
+    ccall((:mtErrorLocalizedRecoveryOptions, libcmt), Ptr{Cstring}, (id{NSError}, Ptr{Csize_t}, Ptr{Cstring}), err, count, options)
 end
 
 function mtErrorLocalizedRecoverySuggestion(err)
-    ccall((:mtErrorLocalizedRecoverySuggestion, libcmt), Cstring, (id,), err)
+    ccall((:mtErrorLocalizedRecoverySuggestion, libcmt), Cstring, (id{NSError},), err)
 end
 
 function mtErrorLocalizedFailureReason(err)
-    ccall((:mtErrorLocalizedFailureReason, libcmt), Cstring, (id,), err)
+    ccall((:mtErrorLocalizedFailureReason, libcmt), Cstring, (id{NSError},), err)
 end
 
 @cenum MtPixelFormat::UInt32 begin
@@ -1156,15 +1156,15 @@ function mtComputePipelineDescriptorSupportAddingBinaryFunctions(desc)
 end
 
 function mtNewComputePipelineStateWithFunction(device, fun, error)
-    ccall((:mtNewComputePipelineStateWithFunction, libcmt), Ptr{MtComputePipelineState}, (Ptr{MtDevice}, Ptr{MtFunction}, Ptr{id}), device, fun, error)
+    ccall((:mtNewComputePipelineStateWithFunction, libcmt), Ptr{MtComputePipelineState}, (Ptr{MtDevice}, Ptr{MtFunction}, Ptr{id{NSError}}), device, fun, error)
 end
 
 function mtNewComputePipelineStateWithFunctionReflection(device, fun, opt, reflection, error)
-    ccall((:mtNewComputePipelineStateWithFunctionReflection, libcmt), Ptr{MtComputePipelineState}, (Ptr{MtDevice}, Ptr{MtFunction}, MtPipelineOption, Ptr{Ptr{MtComputePipelineReflection}}, Ptr{id}), device, fun, opt, reflection, error)
+    ccall((:mtNewComputePipelineStateWithFunctionReflection, libcmt), Ptr{MtComputePipelineState}, (Ptr{MtDevice}, Ptr{MtFunction}, MtPipelineOption, Ptr{Ptr{MtComputePipelineReflection}}, Ptr{id{NSError}}), device, fun, opt, reflection, error)
 end
 
 function mtNewComputePipelineStateWithDescriptor(device, desc, opt, reflection, error)
-    ccall((:mtNewComputePipelineStateWithDescriptor, libcmt), Ptr{MtComputePipelineState}, (Ptr{MtDevice}, Ptr{MtComputePipelineDescriptor}, MtPipelineOption, Ptr{Ptr{MtComputePipelineReflection}}, Ptr{id}), device, desc, opt, reflection, error)
+    ccall((:mtNewComputePipelineStateWithDescriptor, libcmt), Ptr{MtComputePipelineState}, (Ptr{MtDevice}, Ptr{MtComputePipelineDescriptor}, MtPipelineOption, Ptr{Ptr{MtComputePipelineReflection}}, Ptr{id{NSError}}), device, desc, opt, reflection, error)
 end
 
 function mtComputePipelineDevice(pip)
@@ -1276,7 +1276,7 @@ function mtNewFunctionWithName(lib, name)
 end
 
 function mtNewFunctionWithNameConstantValues(lib, name, constantValues, error)
-    ccall((:mtNewFunctionWithNameConstantValues, libcmt), Ptr{MtFunction}, (Ptr{MtLibrary}, Cstring, Ptr{MtFunctionConstantValues}, Ptr{id}), lib, name, constantValues, error)
+    ccall((:mtNewFunctionWithNameConstantValues, libcmt), Ptr{MtFunction}, (Ptr{MtLibrary}, Cstring, Ptr{MtFunctionConstantValues}, Ptr{id{NSError}}), lib, name, constantValues, error)
 end
 
 function mtFunctionDevice(fun)
@@ -1328,19 +1328,19 @@ function mtNewDefaultLibrary(device)
 end
 
 function mtNewLibraryWithFile(device, filepath, error)
-    ccall((:mtNewLibraryWithFile, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Cstring, Ptr{id}), device, filepath, error)
+    ccall((:mtNewLibraryWithFile, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Cstring, Ptr{id{NSError}}), device, filepath, error)
 end
 
 function mtNewLibraryWithURL(device, url, error)
-    ccall((:mtNewLibraryWithURL, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Cstring, Ptr{id}), device, url, error)
+    ccall((:mtNewLibraryWithURL, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Cstring, Ptr{id{NSError}}), device, url, error)
 end
 
 function mtNewLibraryWithSource(device, source, Opts, error)
-    ccall((:mtNewLibraryWithSource, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Cstring, Ptr{MtCompileOptions}, Ptr{id}), device, source, Opts, error)
+    ccall((:mtNewLibraryWithSource, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Cstring, Ptr{MtCompileOptions}, Ptr{id{NSError}}), device, source, Opts, error)
 end
 
 function mtNewLibraryWithData(device, buffer, size, error)
-    ccall((:mtNewLibraryWithData, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Ptr{Cvoid}, Csize_t, Ptr{id}), device, buffer, size, error)
+    ccall((:mtNewLibraryWithData, libcmt), Ptr{MtLibrary}, (Ptr{MtDevice}, Ptr{Cvoid}, Csize_t, Ptr{id{NSError}}), device, buffer, size, error)
 end
 
 function mtLibraryDevice(lib)
@@ -1372,7 +1372,7 @@ function mtBinaryArchiveDescriptorURLSet(desc, path)
 end
 
 function mtNewBinaryArchiveWithDescriptor(device, desc, error)
-    ccall((:mtNewBinaryArchiveWithDescriptor, libcmt), Ptr{MtBinaryArchive}, (Ptr{MtDevice}, Ptr{MtBinaryArchiveDescriptor}, Ptr{id}), device, desc, error)
+    ccall((:mtNewBinaryArchiveWithDescriptor, libcmt), Ptr{MtBinaryArchive}, (Ptr{MtDevice}, Ptr{MtBinaryArchiveDescriptor}, Ptr{id{NSError}}), device, desc, error)
 end
 
 function mtBinaryArchiveDevice(bin)
@@ -1388,15 +1388,15 @@ function mtBinaryArchiveLabelSet(bin, label)
 end
 
 function mtBinaryArchiveAddComputePipelineFunctions(bin, desc, error)
-    ccall((:mtBinaryArchiveAddComputePipelineFunctions, libcmt), Cvoid, (Ptr{MtBinaryArchive}, Ptr{MtComputePipelineDescriptor}, Ptr{id}), bin, desc, error)
+    ccall((:mtBinaryArchiveAddComputePipelineFunctions, libcmt), Cvoid, (Ptr{MtBinaryArchive}, Ptr{MtComputePipelineDescriptor}, Ptr{id{NSError}}), bin, desc, error)
 end
 
 function mtBinaryArchiveAddFunction(bin, desc, lib, error)
-    ccall((:mtBinaryArchiveAddFunction, libcmt), Cvoid, (Ptr{MtBinaryArchive}, Ptr{MtFunctionDescriptor}, Ptr{MtLibrary}, Ptr{id}), bin, desc, lib, error)
+    ccall((:mtBinaryArchiveAddFunction, libcmt), Cvoid, (Ptr{MtBinaryArchive}, Ptr{MtFunctionDescriptor}, Ptr{MtLibrary}, Ptr{id{NSError}}), bin, desc, lib, error)
 end
 
 function mtBinaryArchiveSerialize(bin, path, error)
-    ccall((:mtBinaryArchiveSerialize, libcmt), Cvoid, (Ptr{MtBinaryArchive}, Cstring, Ptr{id}), bin, path, error)
+    ccall((:mtBinaryArchiveSerialize, libcmt), Cvoid, (Ptr{MtBinaryArchive}, Cstring, Ptr{id{NSError}}), bin, path, error)
 end
 
 function mtBufferContents(buf)
@@ -1686,7 +1686,7 @@ function mtSetFunc(pipDesc, func, functype)
 end
 
 function mtNewRenderState(device, pipDesc, error)
-    ccall((:mtNewRenderState, libcmt), Ptr{MtRenderPipeline}, (Ptr{MtDevice}, Ptr{MtRenderDesc}, Ptr{id}), device, pipDesc, error)
+    ccall((:mtNewRenderState, libcmt), Ptr{MtRenderPipeline}, (Ptr{MtDevice}, Ptr{MtRenderDesc}, Ptr{id{NSError}}), device, pipDesc, error)
 end
 
 function mtColorPixelFormat(renderdesc, index, pixelFormat)
@@ -1876,7 +1876,7 @@ function mtCommandBufferErrorOptions(cmdb)
 end
 
 function mtCommandBufferError(cmdb)
-    ccall((:mtCommandBufferError, libcmt), id, (Ptr{MtCommandBuffer},), cmdb)
+    ccall((:mtCommandBufferError, libcmt), id{NSError}, (Ptr{MtCommandBuffer},), cmdb)
 end
 
 function mtCommandBufferKernelStartTime(cmdb)
@@ -2384,7 +2384,7 @@ function mtSupportsDestination(manager, destination)
 end
 
 function mtStartCaptureWithDescriptor(manager, descriptor, error)
-    ccall((:mtStartCaptureWithDescriptor, libcmt), Bool, (Ptr{MtCaptureManager}, Ptr{MtCaptureDescriptor}, Ptr{id}), manager, descriptor, error)
+    ccall((:mtStartCaptureWithDescriptor, libcmt), Bool, (Ptr{MtCaptureManager}, Ptr{MtCaptureDescriptor}, Ptr{id{NSError}}), manager, descriptor, error)
 end
 
 function mtStopCapture(manager)

diff --git a/lib/mtl/MTL.jl b/lib/mtl/MTL.jl
@@ -35,8 +35,8 @@ include("helpers.jl")
 # high-level wrappers
 include("size.jl")
 include("storage_type.jl")
-include("resource.jl")
 include("device.jl")
+include("resource.jl")
 include("compile-opts.jl")
 include("library.jl")
 include("function.jl")

diff --git a/lib/mtl/buffer.jl b/lib/mtl/buffer.jl
@@ -7,7 +7,7 @@ export MTLBuffer, device, contents, alloc, free, handle
 # compatibility with cmt
 Base.unsafe_convert(T::Type{Ptr{MtBuffer}}, obj::MTLBuffer) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLBuffer(ptr::Ptr{MtBuffer}) = MTLBuffer(reinterpret(id, ptr))
+MTLBuffer(ptr::Ptr{MtBuffer}) = MTLBuffer(reinterpret(id{MTLBuffer}, ptr))
 
 
 ## properties

diff --git a/lib/mtl/command_buf.jl b/lib/mtl/command_buf.jl
@@ -125,7 +125,7 @@ function Base.getproperty(o::MtlCommandBuffer, f::Symbol)
         mtCommandBufferStatus(o)
     elseif f === :error
         ptr = mtCommandBufferError(o)
-        ptr == C_NULL ? nothing : NSError(ptr)
+        ptr == nil ? nothing : NSError(ptr)
     elseif f === :errorOptions
         mtCommandBufferErrorOptions(o)
     elseif f === :kernelStartTime

diff --git a/lib/mtl/compile-opts.jl b/lib/mtl/compile-opts.jl
@@ -5,7 +5,7 @@ export MTLCompileOptions
 # compatibility with cmt
 Base.unsafe_convert(T::Type{Ptr{MtCompileOptions}}, obj::MTLCompileOptions) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLCompileOptions(ptr::Ptr{MtCompileOptions}) = MTLCompileOptions(reinterpret(id, ptr))
+MTLCompileOptions(ptr::Ptr{MtCompileOptions}) = MTLCompileOptions(reinterpret(id{MTLCompileOptions}, ptr))
 
 function MTLCompileOptions()
     handle = @objc [MTLCompileOptions new]::id{MTLCompileOptions}

diff --git a/lib/mtl/device.jl b/lib/mtl/device.jl
@@ -5,18 +5,19 @@ export MTLDevice, devices
 # compatibility with cmt
 Base.unsafe_convert(T::Type{Ptr{MtDevice}}, obj::MTLDevice) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLDevice(ptr::Ptr{MtDevice}) = MTLDevice(reinterpret(id, ptr))
+MTLDevice(ptr::Ptr{MtDevice}) = MTLDevice(reinterpret(id{MTLDevice}, ptr))
 
-MTLCreateSystemDefaultDevice() = MTLDevice(ccall(:MTLCreateSystemDefaultDevice, id, ()))
+MTLCreateSystemDefaultDevice() =
+    MTLDevice(ccall(:MTLCreateSystemDefaultDevice, id{MTLDevice}, ()))
 
 """
     devices()
 
 Get an iterator for the compute devices.
 """
 function devices()
-    list = NSArray(ccall(:MTLCopyAllDevices, id, ()))
-    MTLDevice.(collect(list))
+    list = NSArray(ccall(:MTLCopyAllDevices, id{NSArray}, ()))
+    [reinterpret(MTLDevice, dev) for dev in list]
 end
 
 """

diff --git a/lib/mtl/events.jl b/lib/mtl/events.jl
@@ -15,10 +15,10 @@ end
 # compatibility with cmt
 Base.unsafe_convert(T::Type{Ptr{MtEvent}}, obj::Union{MTLEvent,MTLSharedEvent}) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLEvent(ptr::Ptr{MtEvent}) = MTLEvent(reinterpret(id, ptr))
+MTLEvent(ptr::Ptr{MtEvent}) = MTLEvent(reinterpret(id{MTLEvent}, ptr))
 Base.unsafe_convert(T::Type{Ptr{MtSharedEvent}}, obj::MTLSharedEvent) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLSharedEvent(ptr::Ptr{MtSharedEvent}) = MTLSharedEvent(reinterpret(id, ptr))
+MTLSharedEvent(ptr::Ptr{MtSharedEvent}) = MTLSharedEvent(reinterpret(id{MTLSharedEvent}, ptr))
 
 
 ## properties

diff --git a/lib/mtl/fences.jl b/lib/mtl/fences.jl
@@ -9,7 +9,7 @@ end
 # compatibility with cmt
 Base.unsafe_convert(T::Type{Ptr{MtFence}}, obj::MTLFence) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLFence(ptr::Ptr{MtFence}) = MTLFence(reinterpret(id, ptr))
+MTLFence(ptr::Ptr{MtFence}) = MTLFence(reinterpret(id{MTLFence}, ptr))
 
 
 ## properties

diff --git a/lib/mtl/helpers.jl b/lib/mtl/helpers.jl
@@ -62,7 +62,7 @@ error[] != nil && throw(NSError(error[]))
 """
 macro mtlthrows(error, fun)
     expr = quote
-        $error = Ref{id}(nil)
+        $error = Ref{id{NSError}}(nil)
         result = $fun
         if $error[] != nil
             throw(NSError($(error)[]))

diff --git a/lib/mtl/profile.jl b/lib/mtl/profile.jl
@@ -137,7 +137,7 @@ function Base.getproperty(desc::MtlCaptureDescriptor, f::Symbol)
         ptr == C_NULL && return nothing
         if desc.cap_obj_type == MtCaptureDescriptorCaptureObjectTypeDevice
             # XXX: temporary hack while we migrate away from cmt
-            MTLDevice(reinterpret(id, ptr))
+            MTLDevice(reinterpret(id{MTLDevice}, ptr))
         else
             obj_enum_to_jl_typ[desc.cap_obj_type](ptr)
         end
@@ -267,7 +267,7 @@ function startCapture(manager::MtlCaptureManager, desc::MtlCaptureDescriptor)
             throw(ArgumentError("`dir` keyword argument to @profile should not be an existing directory"))
     end
 
-    _errptr = Ref{id}(nil)
+    _errptr = Ref{id{NSError}}(nil)
     success = mtStartCaptureWithDescriptor(manager.handle, desc.handle, _errptr)
     success || throw(NSError(_errptr[]))
     return

diff --git a/lib/mtl/resource.jl b/lib/mtl/resource.jl
@@ -5,7 +5,7 @@ export MTLResource
 # compatibility with cmt
 Base.unsafe_convert(T::Type{Ptr{MtResource}}, obj::MTLResource) =
     reinterpret(T, Base.unsafe_convert(id, obj))
-MTLResource(ptr::Ptr{MtResource}) = MTLResource(reinterpret(id, ptr))
+MTLResource(ptr::Ptr{MtResource}) = MTLResource(reinterpret(id{MTLResource}, ptr))
 
 
 ## properties