From ad11bf071b980b19b4cd9680d73e0a110d82af7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Thu, 22 Aug 2019 22:26:07 +0200 Subject: [PATCH] Use `HasRawWindowHandle` in `create_surface` --- examples/framework.rs | 5 +---- examples/hello-triangle/main.rs | 4 +--- src/lib.rs | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/examples/framework.rs b/examples/framework.rs index cfcb0ec0b8..df3a846170 100644 --- a/examples/framework.rs +++ b/examples/framework.rs @@ -54,16 +54,13 @@ pub fn run(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) }; diff --git a/examples/hello-triangle/main.rs b/examples/hello-triangle/main.rs index f0596ebe72..0adde7d2ae 100644 --- a/examples/hello-triangle/main.rs +++ b/examples/hello-triangle/main.rs @@ -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) }; diff --git a/src/lib.rs b/src/lib.rs index ca135999a7..98b4646d6c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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(&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()), } }