updated to Swift 3

ch10/chapter10.playground/Sources/MetalView.swift

@@ -14,13 +14,13 @@ public class MetalView: NSObject, MTKViewDelegate {
     
     func registerShaders() {
         device = MTLCreateSystemDefaultDevice()!
-        queue = device.newCommandQueue()
+        queue = device.makeCommandQueue()
-        let path = Bundle.main.pathForResource("Shaders", ofType: "metal")
+        let path = Bundle.main.path(forResource: "Shaders", ofType: "metal")
         do {
             let input = try String(contentsOfFile: path!, encoding: String.Encoding.utf8)
-            let library = try device.newLibrary(withSource: input, options: nil)
+            let library = try device.makeLibrary(source: input, options: nil)
-            let kernel = library.newFunction(withName: "compute")!
+            let kernel = library.makeFunction(name: "compute")!
-            cps = try device.newComputePipelineState(with: kernel)
+            cps = try device.makeComputePipelineState(function: kernel)
         } catch let e {
             Swift.print("\(e)")
         }
@@ -30,8 +30,8 @@ public class MetalView: NSObject, MTKViewDelegate {
     
     public func draw(in view: MTKView) {
         if let drawable = view.currentDrawable {
-            let commandBuffer = queue.commandBuffer()
+            let commandBuffer = queue.makeCommandBuffer()
-            let commandEncoder = commandBuffer.computeCommandEncoder()
+            let commandEncoder = commandBuffer.makeComputeCommandEncoder()
             commandEncoder.setComputePipelineState(cps)
             commandEncoder.setTexture(drawable.texture, at: 0)
             let threadGroupCount = MTLSizeMake(8, 8, 1)

ch11/chapter11.playground/Sources/MetalView.swift

@@ -2,44 +2,44 @@
 import MetalKit
 
 public class MetalView: NSObject, MTKViewDelegate {
-    
+  
-    public var device: MTLDevice!
+  public var device: MTLDevice!
-    var queue: MTLCommandQueue!
+  var queue: MTLCommandQueue!
-    var cps: MTLComputePipelineState!
+  var cps: MTLComputePipelineState!
-    
+  
-    override public init() {
+  override public init() {
-        super.init()
+    super.init()
-        registerShaders()
+    registerShaders()
+  }
+  
+  func registerShaders() {
+    device = MTLCreateSystemDefaultDevice()!
+    queue = device.makeCommandQueue()
+    let path = Bundle.main.path(forResource: "Shaders", ofType: "metal")
+    do {
+      let input = try String(contentsOfFile: path!, encoding: String.Encoding.utf8)
+      let library = try device.makeLibrary(source: input, options: nil)
+      let kernel = library.makeFunction(name: "compute")!
+      cps = try device.makeComputePipelineState(function: kernel)
+    } catch let e {
+      Swift.print("\(e)")
     }
-    
+  }
-    func registerShaders() {
+  
-        device = MTLCreateSystemDefaultDevice()!
+  public func mtkView(_ view: MTKView, drawableSizeWillChange size: CGSize) {}
-        queue = device.newCommandQueue()
+  
-        let path = Bundle.main.pathForResource("Shaders", ofType: "metal")
+  public func draw(in view: MTKView) {
-        do {
+    if let drawable = view.currentDrawable {
-            let input = try String(contentsOfFile: path!, encoding: String.Encoding.utf8)
+      let commandBuffer = queue.makeCommandBuffer()
-            let library = try device.newLibrary(withSource: input, options: nil)
+      let commandEncoder = commandBuffer.makeComputeCommandEncoder()
-            let kernel = library.newFunction(withName: "compute")!
+      commandEncoder.setComputePipelineState(cps)
-            cps = try device.newComputePipelineState(with: kernel)
+      commandEncoder.setTexture(drawable.texture, at: 0)
-        } catch let e {
+      let threadGroupCount = MTLSizeMake(8, 8, 1)
-            Swift.print("\(e)")
+      let threadGroups = MTLSizeMake(drawable.texture.width / threadGroupCount.width, drawable.texture.height / threadGroupCount.height, 1)
-        }
+      commandEncoder.dispatchThreadgroups(threadGroups, threadsPerThreadgroup: threadGroupCount)
-    }
+      commandEncoder.endEncoding()
-    
+      commandBuffer.present(drawable)
-    public func mtkView(_ view: MTKView, drawableSizeWillChange size: CGSize) {}
+      commandBuffer.commit()
-    
-    public func draw(in view: MTKView) {
-        if let drawable = view.currentDrawable {
-            let commandBuffer = queue.commandBuffer()
-            let commandEncoder = commandBuffer.computeCommandEncoder()
-            commandEncoder.setComputePipelineState(cps)
-            commandEncoder.setTexture(drawable.texture, at: 0)
-            let threadGroupCount = MTLSizeMake(8, 8, 1)
-            let threadGroups = MTLSizeMake(drawable.texture.width / threadGroupCount.width, drawable.texture.height / threadGroupCount.height, 1)
-            commandEncoder.dispatchThreadgroups(threadGroups, threadsPerThreadgroup: threadGroupCount)
-            commandEncoder.endEncoding()
-            commandBuffer.present(drawable)
-            commandBuffer.commit()
-        }
     }
+  }
 }