nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-10-30 05:52:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix macos compilation (#929)

Browse Source 
* Fix compilation of vulkano-win

* Update metal-rs to latest
This commit is contained in:
Yanchi Toth 2018-03-02 21:14:34 +10:00 committed by Pierre Krieger
parent a9ac84c877
commit f611365225
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vulkano-win/Cargo.toml
View File

@ -12,6 +12,6 @@ vulkano = { version = "0.7.0", path = "../vulkano" }
winit = "0.7.0"
[target.'cfg(target_os = "macos")'.dependencies]
metal-rs = "0.5.2"
metal-rs = "0.6.6"
cocoa = "0.11"
objc = "0.2.2"

4
vulkano-win/src/lib.rs
View File

@ -165,7 +165,7 @@ unsafe fn winit_to_surface(instance: Arc<Instance>, win: winit::Window)
let wnd: cocoa_id = mem::transmute(win.get_nswindow());
let layer = CAMetalLayer::new();
let layer = CoreAnimationLayer::new();
layer.set_edge_antialiasing_mask(0);
layer.set_presents_with_transaction(false);
@ -174,7 +174,7 @@ unsafe fn winit_to_surface(instance: Arc<Instance>, win: winit::Window)
let view = wnd.contentView();
layer.set_contents_scale(view.backingScaleFactor());
view.setLayer(mem::transmute(layer.0)); // Bombs here with out of memory
view.setLayer(mem::transmute(layer.as_ref())); // Bombs here with out of memory
view.setWantsLayer(YES);
Surface::from_macos_moltenvk(instance, win.get_nsview() as *const (), win)