ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 21:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

metal engine macos changes

Browse Source
This commit is contained in:
Mike Renoir 2023-12-07 12:22:24 +04:00
parent 3df7111853
commit a723e852f7
8 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
View File

@ -2,6 +2,7 @@
import UIKit
#else
import AppKit
import TGUIKit
#endif
import CoreMedia
import Accelerate

1
submodules/MediaPlayer/Sources/SoftwareVideoSource.swift
View File

@ -3,6 +3,7 @@ import Foundation
import UIKit
#else
import AppKit
import TGUIKit
#endif
import CoreMedia
import SwiftSignalKit

1
submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
View File

@ -3,6 +3,7 @@ import Foundation
import UIKit
#else
import AppKit
import TGUIKit
#endif
import SwiftSignalKit
import Postbox

1
submodules/MetalEngine/Package.swift
View File

@ -5,6 +5,7 @@ import PackageDescription
let package = Package(
name: "MetalEngine",
platforms: [.macOS(.v10_13)],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(

46
submodules/MetalEngine/Sources/MetalEngine.swift
View File

@ -666,13 +666,6 @@ public final class MetalEngine {
fileprivate var computeStates: [ObjectIdentifier: ComputeState] = [:]
init?(device: MTLDevice) {
let mainBundle = Bundle(for: Impl.self)
guard let path = mainBundle.path(forResource: "MetalEngineMetalSourcesBundle", ofType: "bundle") else {
return nil
}
guard let bundle = Bundle(path: path) else {
return nil
}
self.device = device
@ -681,15 +674,42 @@ public final class MetalEngine {
}
self.commandQueue = commandQueue
guard let library = try? device.makeDefaultLibrary(bundle: bundle) else {
return nil
}
self.library = library
let library: MTLLibrary?
guard let vertexFunction = library.makeFunction(name: "clearVertex") else {
#if os(iOS)
let mainBundle = Bundle(for: Impl.self)
guard let path = mainBundle.path(forResource: "MetalEngineMetalSourcesBundle", ofType: "bundle") else {
return nil
}
guard let fragmentFunction = library.makeFunction(name: "clearFragment") else {
guard let bundle = Bundle(path: path) else {
return nil
}
library = try? device.makeDefaultLibrary(bundle: bundle)
#else
let mainBundle = Bundle(for: Impl.self)
guard let path = mainBundle.path(forResource: "MetalEngineMetalSourcesBundle", ofType: "bundle") else {
return nil
}
guard let bundle = Bundle(path: path) else {
return nil
}
guard let path = bundle.path(forResource: "MetalEngineShaders", ofType: "metallib") else {
return nil
}
library = try? device.makeLibrary(URL: .init(fileURLWithPath: path))
#endif
guard let lib = library else {
return nil
}
self.library = lib
guard let vertexFunction = lib.makeFunction(name: "clearVertex") else {
return nil
}
guard let fragmentFunction = lib.makeFunction(name: "clearFragment") else {
return nil
}

6
submodules/TelegramCore/Sources/WebpagePreview.swift
View File

@ -18,6 +18,10 @@ public enum WebpagePreviewResult: Equatable {
case progress
case result(Result?)
}
#if os(macOS)
private typealias UIImage = NSImage
#endif
public func webpagePreview(account: Account, urls: [String], webpageId: MediaId? = nil, forPeerId: PeerId? = nil) -> Signal<WebpagePreviewResult, NoError> {
return webpagePreviewWithProgress(account: account, urls: urls, webpageId: webpageId, forPeerId: forPeerId)
@ -48,7 +52,7 @@ public func webpagePreviewWithProgress(account: Account, urls: [String], webpage
}
return .single(.result(WebpagePreviewResult.Result(webpage: webpage, sourceUrl: sourceUrl)))
} else {
if #available(iOS 13.0, *) {
if #available(iOS 13.0, macOS 10.15, *) {
if let forPeerId, forPeerId.namespace == Namespaces.Peer.SecretChat, let sourceUrl = urls.first, let url = URL(string: sourceUrl) {
let localHosts: [String] = [
"twitter.com",

1
submodules/Utils/LokiRng/Package.swift
View File

@ -5,6 +5,7 @@ import PackageDescription
let package = Package(
name: "LokiRng",
platforms: [.macOS(.v10_13)],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(

1
submodules/Utils/ShelfPack/Package.swift
View File

@ -5,6 +5,7 @@ import PackageDescription
let package = Package(
name: "ShelfPack",
platforms: [.macOS(.v10_13)],
products: [
// Products define the executables and libraries a package produces, and make them visible to other packages.
.library(