diff --git a/submodules/MetalEngine/BUILD b/submodules/MetalEngine/BUILD index 2460b6126b..b721af49c2 100644 --- a/submodules/MetalEngine/BUILD +++ b/submodules/MetalEngine/BUILD @@ -12,7 +12,7 @@ load("//build-system/bazel-utils:plist_fragment.bzl", filegroup( name = "MetalSources", srcs = glob([ - "Metal/**/*.metal", + "Sources/**/*.metal", ]), visibility = ["//visibility:public"], ) diff --git a/submodules/MetalEngine/Package.swift b/submodules/MetalEngine/Package.swift index ec3838851c..85b28b7bbd 100644 --- a/submodules/MetalEngine/Package.swift +++ b/submodules/MetalEngine/Package.swift @@ -25,6 +25,7 @@ let package = Package( name: "MetalEngine", dependencies: [.product(name: "ShelfPack", package: "ShelfPack", condition: nil), .product(name: "TGUIKit", package: "TGUIKit", condition: nil)], - path: "Sources/"), + path: "Sources/", + resources: [.copy("MetalEngineShaders.metal")]), ] ) diff --git a/submodules/MetalEngine/Sources/MetalEngine.swift b/submodules/MetalEngine/Sources/MetalEngine.swift index 87672cf6b5..b34ca53a79 100644 --- a/submodules/MetalEngine/Sources/MetalEngine.swift +++ b/submodules/MetalEngine/Sources/MetalEngine.swift @@ -686,17 +686,7 @@ public final class MetalEngine { } 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)) + library = try? device.makeDefaultLibrary(bundle: Bundle.module) #endif diff --git a/submodules/MetalEngine/Metal/MetalEngineShaders.metal b/submodules/MetalEngine/Sources/MetalEngineShaders.metal similarity index 100% rename from submodules/MetalEngine/Metal/MetalEngineShaders.metal rename to submodules/MetalEngine/Sources/MetalEngineShaders.metal