github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge #71

Browse Source 
71: Use `HasRawWindowHandle` in `create_surface` r=kvark a=hecrj

This change lets users use `wgpu` without listing `raw-window-handle` as a direct dependency themselves.

Co-authored-by: Héctor Ramón Jiménez <hector0193@gmail.com>
This commit is contained in:
bors[bot]
2019-08-23 15:35:30 +00:00
committed by GitHub
parent 0641ef6aa3 ad11bf071b
commit b7d8d8fa99
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/framework.rs
View File

@@ -54,16 +54,13 @@ pub fn run<E: Example>(title: &str) {
#[cfg(not(feature = "gl"))]
let (_window, instance, hidpi_factor, size, surface) = {
use raw_window_handle::HasRawWindowHandle as _;
let window = winit::window::Window::new(&event_loop).unwrap();
window.set_title(title);
let hidpi_factor = window.hidpi_factor();
let size = window.inner_size().to_physical(hidpi_factor);
let instance = wgpu::Instance::new();
let surface = instance.create_surface(window.raw_window_handle());
let surface = instance.create_surface(&window);
(window, instance, hidpi_factor, size, surface)
};

4
examples/hello-triangle/main.rs
View File

@@ -9,15 +9,13 @@ fn main() {
#[cfg(not(feature = "gl"))]
let (_window, instance, size, surface) = {
use raw_window_handle::HasRawWindowHandle as _;
let window = winit::window::Window::new(&event_loop).unwrap();
let size = window
.inner_size()
.to_physical(window.hidpi_factor());
let instance = wgpu::Instance::new();
let surface = instance.create_surface(window.raw_window_handle());
let surface = instance.create_surface(&window);
(window, instance, size, surface)
};

4
src/lib.rs
View File

@@ -560,9 +560,9 @@ impl Instance {
/// Creates a surface from a raw window handle.
#[cfg(not(feature = "gl"))]
pub fn create_surface(&self, raw_handle: raw_window_handle::RawWindowHandle) -> Surface {
pub fn create_surface<W: raw_window_handle::HasRawWindowHandle>(&self, window: &W) -> Surface {
Surface {
id: wgn::wgpu_instance_create_surface(self.id, raw_handle),
id: wgn::wgpu_instance_create_surface(self.id, window.raw_window_handle()),
}
}