From ea2b9fc758b5e96d255eec12dc5c6d4266e71bb2 Mon Sep 17 00:00:00 2001 From: daemyung jang Date: Wed, 6 Apr 2022 08:21:21 +0900 Subject: [PATCH] Fix runtime errors --- .../1. reflection.xcplaygroundpage/Sources/Renderer.swift | 4 +--- .../2. refraction.xcplaygroundpage/Sources/Renderer.swift | 4 +--- .../Pages/3. water.xcplaygroundpage/Sources/Renderer.swift | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/1. reflection.xcplaygroundpage/Sources/Renderer.swift b/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/1. reflection.xcplaygroundpage/Sources/Renderer.swift index 6562294..0a68795 100644 --- a/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/1. reflection.xcplaygroundpage/Sources/Renderer.swift +++ b/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/1. reflection.xcplaygroundpage/Sources/Renderer.swift @@ -18,9 +18,7 @@ public class Renderer: NSObject, MTKViewDelegate { device = MTLCreateSystemDefaultDevice() queue = device!.makeCommandQueue() do { - guard let path = Bundle.main.path(forResource: "Shaders", ofType: "metal") else { fatalError() } - let input = try String(contentsOfFile: path, encoding: String.Encoding.utf8) - let library = try device.makeLibrary(source: input, options: nil) + let library = device.makeDefaultLibrary()! guard let kernel = library.makeFunction(name: "compute") else { fatalError() } pipelineState = try device.makeComputePipelineState(function: kernel) } catch let e { diff --git a/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/2. refraction.xcplaygroundpage/Sources/Renderer.swift b/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/2. refraction.xcplaygroundpage/Sources/Renderer.swift index 6562294..0a68795 100644 --- a/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/2. refraction.xcplaygroundpage/Sources/Renderer.swift +++ b/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/2. refraction.xcplaygroundpage/Sources/Renderer.swift @@ -18,9 +18,7 @@ public class Renderer: NSObject, MTKViewDelegate { device = MTLCreateSystemDefaultDevice() queue = device!.makeCommandQueue() do { - guard let path = Bundle.main.path(forResource: "Shaders", ofType: "metal") else { fatalError() } - let input = try String(contentsOfFile: path, encoding: String.Encoding.utf8) - let library = try device.makeLibrary(source: input, options: nil) + let library = device.makeDefaultLibrary()! guard let kernel = library.makeFunction(name: "compute") else { fatalError() } pipelineState = try device.makeComputePipelineState(function: kernel) } catch let e { diff --git a/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/3. water.xcplaygroundpage/Sources/Renderer.swift b/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/3. water.xcplaygroundpage/Sources/Renderer.swift index 477afa2..ab4123d 100755 --- a/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/3. water.xcplaygroundpage/Sources/Renderer.swift +++ b/20-advanced-lighting/starter/AdvancedLighting.playground/Pages/3. water.xcplaygroundpage/Sources/Renderer.swift @@ -18,10 +18,8 @@ public class Renderer: NSObject, MTKViewDelegate { func initializeMetal() { 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 library = device.makeDefaultLibrary()! let kernel = library.makeFunction(name: "compute")! pipelineState = try device!.makeComputePipelineState(function: kernel) } catch let e {