Merge pull request #147 from gwihlidal/mac_fixes

Compile fixes for macOS
This commit is contained in:
Maik Klein 2018-11-16 14:04:06 +01:00 committed by GitHub
commit 842bf92e5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -153,15 +153,15 @@ unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
view.setWantsLayer(YES); view.setWantsLayer(YES);
let create_info = vk::MacOSSurfaceCreateInfoMVK { let create_info = vk::MacOSSurfaceCreateInfoMVK {
s_type: vk::StructureType::MacOSSurfaceCreateInfoMvk, s_type: vk::StructureType::MACOS_SURFACE_CREATE_INFO_M,
p_next: ptr::null(), p_next: ptr::null(),
flags: Default::default(), flags: Default::default(),
p_view: window.get_nsview() as *const vk::types::c_void p_view: window.get_nsview() as *const c_void
}; };
let macos_surface_loader = let macos_surface_loader =
MacOSSurface::new(entry, instance).expect("Unable to load macOS surface"); MacOSSurface::new(entry, instance);
macos_surface_loader.create_macos_surface_mvk(&create_info, None) macos_surface_loader.create_mac_os_surface_mvk(&create_info, None)
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]