Updated for Xcode 8 beta 6.

NickAger · Aug 17, 2016 · c9326ae · c9326ae
1 parent 6e5a777
commit c9326ae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/framework/Source/OpenGLRendering.swift b/framework/Source/OpenGLRendering.swift
@@ -206,15 +206,15 @@ extension String {
 #if os(Linux)
         // cStringUsingEncoding isn't yet defined in the Linux Foundation.
         // This approach is roughly 35X slower than the cStringUsingEncoding one.
-        let bufferCString = UnsafeMutablePointer<UInt8>.alloc(self.characters.count+1)
+        let bufferCString = UnsafeMutablePointer<UInt8>.allocate(capacity:self.characters.count+1)
         for (index, characterValue) in self.utf8.enumerate() {
             bufferCString[index] = characterValue
         }
         bufferCString[self.characters.count] = 0 // Have to add a null termination
 
         operation(UnsafePointer<GLchar>(bufferCString))
 
-        bufferCString.dealloc(self.characters.count)
+        bufferCString.deallocate(capacity:self.characters.count)
 #else
         if let value = self.cString(using:String.Encoding.utf8) {
             operation(UnsafePointer<GLchar>(value))

diff --git a/framework/Source/SerialDispatch.swift b/framework/Source/SerialDispatch.swift
@@ -36,19 +36,15 @@ public let lowProcessingQueuePriority:DispatchQueue.GlobalQueuePriority = {
 }()
 
 func runAsynchronouslyOnMainQueue(_ mainThreadOperation:@escaping () -> ()) {
-// FIXME: Xcode 8 beta 2
-//    if (Thread.isMainThread) {
-    if (Thread.isMainThread()) {
+    if (Thread.isMainThread) {
         mainThreadOperation()
     } else {
         DispatchQueue.main.async(execute:mainThreadOperation)
     }
 }
 
 func runOnMainQueue(_ mainThreadOperation:() -> ()) {
-// FIXME: Xcode 8 beta 2
-//    if (Thread.isMainThread) {
-    if (Thread.isMainThread()) {
+    if (Thread.isMainThread) {
         mainThreadOperation()
     } else {
         DispatchQueue.main.sync(execute:mainThreadOperation)

diff --git a/framework/Source/ShaderProgram.swift b/framework/Source/ShaderProgram.swift
@@ -255,9 +255,7 @@ public func crashOnShaderCompileFailure<T>(_ shaderName:String, _ operation:() t
 public func shaderFromFile(_ file:URL) throws -> String {
     // Note: this is a hack until Foundation's String initializers are fully functional
     //        let fragmentShaderString = String(contentsOfURL:fragmentShaderFile, encoding:NSASCIIStringEncoding)
-// FIXME: Xcode 8 beta 2
-    guard (FileManager.default().fileExists(atPath: file.path)) else { throw ShaderCompileError(compileLog:"Shader file \(file) missing")}
-//    guard (FileManager.default().fileExists(atPath: file.path!)) else { throw ShaderCompileError(compileLog:"Shader file \(file) missing")}
+    guard (FileManager.default.fileExists(atPath: file.path)) else { throw ShaderCompileError(compileLog:"Shader file \(file) missing")}
 
     let fragmentShaderString = try NSString(contentsOfFile:file.path, encoding:String.Encoding.ascii.rawValue)