Cleanup rebase glitches

Author: christiangnrd

lib/mtl/command_queue.jl

@@ -1,23 +1,21 @@
 
-@static if Metal.is_macos(v"15.0.0")
-    export MTLCommandQueueDescriptor
-
-    # @objcwrapper immutable=false MTLCommandQueueDescriptor <: NSObject
-
-    function MTLCommandQueueDescriptor()
-        handle = @objc [MTLCommandQueueDescriptor alloc]::id{MTLCommandQueueDescriptor}
-        obj = MTLCommandQueueDescriptor(handle)
-        finalizer(release, obj)
-        @objc [obj::id{MTLCommandQueueDescriptor} init]::id{MTLCommandQueueDescriptor}
-        return obj
-    end
-
-    function MTLCommandQueue(dev::MTLDevice, descriptor::MTLCommandQueueDescriptor)
-        handle = @objc [dev::id{MTLDevice} newCommandQueueWithDescriptor:descriptor::id{MTLCommandQueueDescriptor}]::id{MTLCommandQueue}
-        obj = MTLCommandQueue(handle)
-        finalizer(release, obj)
-        return obj
-    end
+export MTLCommandQueueDescriptor
+
+# @objcwrapper immutable=false MTLCommandQueueDescriptor <: NSObject
+
+function MTLCommandQueueDescriptor()
+    handle = @objc [MTLCommandQueueDescriptor alloc]::id{MTLCommandQueueDescriptor}
+    obj = MTLCommandQueueDescriptor(handle)
+    finalizer(release, obj)
+    @objc [obj::id{MTLCommandQueueDescriptor} init]::id{MTLCommandQueueDescriptor}
+    return obj
+end
+
+function MTLCommandQueue(dev::MTLDevice, descriptor::MTLCommandQueueDescriptor)
+    handle = @objc [dev::id{MTLDevice} newCommandQueueWithDescriptor:descriptor::id{MTLCommandQueueDescriptor}]::id{MTLCommandQueue}
+    obj = MTLCommandQueue(handle)
+    finalizer(release, obj)
+    return obj
 end
 
 

lib/mtl/log_state.jl

@@ -1,28 +1,26 @@
-@static if Metal.is_macos(v"15.0.0")
-    export MTLLogLevel
+export MTLLogLevel
 
-    export MTLLogStateDescriptor
+export MTLLogStateDescriptor
 
-    # @objcwrapper immutable = false MTLLogStateDescriptor <: NSObject
+# @objcwrapper immutable = false MTLLogStateDescriptor <: NSObject
 
-    function MTLLogStateDescriptor()
-        handle = @objc [MTLLogStateDescriptor alloc]::id{MTLLogStateDescriptor}
-        obj = MTLLogStateDescriptor(handle)
-        finalizer(release, obj)
-        @objc [obj::id{MTLLogStateDescriptor} init]::id{MTLLogStateDescriptor}
-        return obj
-    end
+function MTLLogStateDescriptor()
+    handle = @objc [MTLLogStateDescriptor alloc]::id{MTLLogStateDescriptor}
+    obj = MTLLogStateDescriptor(handle)
+    finalizer(release, obj)
+    @objc [obj::id{MTLLogStateDescriptor} init]::id{MTLLogStateDescriptor}
+    return obj
+end
 
 
-    export MTLLogState
+export MTLLogState
 
-    # @objcwrapper immutable = true MTLLogState <: NSObject
+# @objcwrapper immutable = true MTLLogState <: NSObject
 
-    function MTLLogState(dev::MTLDevice, descriptor::MTLLogStateDescriptor)
-        err = Ref{id{NSError}}(nil)
-        handle = @objc [dev::id{MTLDevice} newLogStateWithDescriptor:descriptor::id{MTLLogStateDescriptor}
-            error:err::Ptr{id{NSError}}]::id{MTLLogState}
-        err[] == nil || throw(NSError(err[]))
-        MTLLogState(handle)
-    end
+function MTLLogState(dev::MTLDevice, descriptor::MTLLogStateDescriptor)
+    err = Ref{id{NSError}}(nil)
+    handle = @objc [dev::id{MTLDevice} newLogStateWithDescriptor:descriptor::id{MTLLogStateDescriptor}
+        error:err::Ptr{id{NSError}}]::id{MTLLogState}
+    err[] == nil || throw(NSError(err[]))
+    MTLLogState(handle)
 end

src/compiler/compilation.jl

@@ -210,7 +210,5 @@ end
         end
     end
 
-    # most of the time, we don't need the function object,
-    # so don't keep it alive unconditionally in GPUCompiler's caches
     pipeline_state, compiled.loggingEnabled
 end