nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass through raw-window-handle

Browse Source
This commit is contained in:
Anton Lazarev 2020-05-04 15:06:03 -04:00
parent 644949d945
commit 29ce9a44cf
No known key found for this signature in database
GPG Key ID: FBD20243E0CD9104
2 changed files with 34 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/src/main.rs
View File

@ -461,10 +461,8 @@ fn main() {
let mut command_buffer_id_manager = wgc::hub::IdentityManager::default();
#[cfg(feature = "winit")]
let surface = global.instance_create_surface(
raw_window_handle::HasRawWindowHandle::raw_window_handle(&window),
wgc::id::TypedId::zip(0, 1, wgt::Backend::Empty),
);
let surface =
global.instance_create_surface(&window, wgc::id::TypedId::zip(0, 1, wgt::Backend::Empty));
let device = match actions.pop() {
Some(trace::Action::Init { desc, backend }) => {

92
wgpu-core/src/instance.rs
View File

@ -220,97 +220,69 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
#[cfg(feature = "raw-window-handle")]
pub fn instance_create_surface(
&self,
handle: raw_window_handle::RawWindowHandle,
handle: &impl raw_window_handle::HasRawWindowHandle,
id_in: Input<G, SurfaceId>,
) -> SurfaceId {
use raw_window_handle::RawWindowHandle as Rwh;
let surface = match handle {
unsafe {
#[cfg(target_os = "ios")]
Rwh::IOS(h) => Surface {
let surface = Surface {
#[cfg(feature = "gfx-backend-vulkan")]
vulkan: None,
metal: self
.instance
.metal
.create_surface_from_uiview(h.ui_view, cfg!(debug_assertions)),
},
metal: self.instance.metal.create_surface(handle).unwrap(),
};
#[cfg(target_os = "macos")]
Rwh::MacOS(h) => {
//TODO: figure out when this is needed, and how to get that without `objc`
//use objc::{msg_send, runtime::Object, sel, sel_impl};
//let ns_view = if h.ns_view.is_null() {
// let ns_window = h.ns_window as *mut Object;
// unsafe { msg_send![ns_window, contentView] }
//} else {
// h.ns_view
//};
Surface {
#[cfg(feature = "gfx-backend-vulkan")]
vulkan: self
.instance
.vulkan
.as_ref()
.map(|inst| inst.create_surface_from_ns_view(h.ns_view)),
metal: self
.instance
.metal
.create_surface_from_nsview(h.ns_view, cfg!(debug_assertions)),
}
}
let surface = Surface {
#[cfg(feature = "gfx-backend-vulkan")]
vulkan: self
.instance
.vulkan
.as_ref()
.map(|inst| inst.create_surface(handle)),
metal: self.instance.metal.create_surface(handle).unwrap(),
};
#[cfg(all(
unix,
not(target_os = "android"),
not(target_os = "ios"),
not(target_os = "macos")
))]
Rwh::Xlib(h) => Surface {
let surface = Surface {
vulkan: self
.instance
.vulkan
.as_ref()
.map(|inst| inst.create_surface_from_xlib(h.display as _, h.window)),
},
#[cfg(all(
unix,
not(target_os = "android"),
not(target_os = "ios"),
not(target_os = "macos")
))]
Rwh::Wayland(h) => Surface {
vulkan: self
.instance
.vulkan
.as_ref()
.map(|inst| inst.create_surface_from_wayland(h.display, h.surface)),
},
.map(|inst| inst.create_surface(handle).ok())
.flatten(),
};
#[cfg(target_os = "android")]
Rwh::Android(h) => Surface {
let surface = Surface {
vulkan: self
.instance
.vulkan
.as_ref()
.map(|inst| inst.create_surface_android(h.a_native_window)),
},
.map(|inst| inst.create_surface(handle).ok())
.flatten(),
};
#[cfg(windows)]
Rwh::Windows(h) => Surface {
let surface = Surface {
vulkan: self
.instance
.vulkan
.as_ref()
.map(|inst| inst.create_surface_from_hwnd(std::ptr::null_mut(), h.hwnd)),
.map(|inst| inst.create_surface(handle).ok())
.flatten(),
dx12: self
.instance
.dx12
.as_ref()
.map(|inst| inst.create_surface_from_hwnd(h.hwnd)),
dx11: self.instance.dx11.create_surface_from_hwnd(h.hwnd),
},
_ => panic!("Unsupported window handle"),
};
.map(|inst| inst.create_surface(handle).ok())
.flatten(),
dx11: self.instance.dx11.create_surface(handle).unwrap(),
};
let mut token = Token::root();
self.surfaces.register_identity(id_in, surface, &mut token)
let mut token = Token::root();
self.surfaces.register_identity(id_in, surface, &mut token)
}
}
pub fn enumerate_adapters(&self, inputs: AdapterInputs<Input<G, AdapterId>>) -> Vec<AdapterId> {