alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

examples: Update to winapi 0.3 and winit 0.11

Browse source
This commit is contained in:
Lucien Greathouse 2018-03-03 00:02:43 -08:00
parent 8e3e3b9e72
commit 91da74fca4
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/Cargo.toml
View file

@ -4,10 +4,9 @@ version = "0.1.0"
authors = ["maik klein <maikklein@googlemail.com>"] authors = ["maik klein <maikklein@googlemail.com>"]
[dependencies] [dependencies]
winit = "0.9.0" winit = "0.11.1"
image = "0.10.4" image = "0.10.4"
ash = { path = "../ash" } ash = { path = "../ash" }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
user32-sys = "0.2.0" winapi = { version = "0.3.4", features = ["windef", "winuser"] }
winapi = "0.2.8"

9
examples/src/lib.rs
View file

@ -1,8 +1,6 @@
#[macro_use] #[macro_use]
extern crate ash; extern crate ash;
#[cfg(windows)] #[cfg(windows)]
extern crate user32;
#[cfg(windows)]
extern crate winapi; extern crate winapi;
extern crate winit; extern crate winit;
@ -117,9 +115,12 @@ unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
instance: &I, instance: &I,
window: &winit::Window, window: &winit::Window,
) -> Result<vk::SurfaceKHR, vk::Result> { ) -> Result<vk::SurfaceKHR, vk::Result> {
use winapi::shared::windef::HWND;
use winapi::um::winuser::GetWindow;
use winit::os::windows::WindowExt; use winit::os::windows::WindowExt;
let hwnd = window.get_hwnd() as *mut winapi::windef::HWND__;
let hinstance = user32::GetWindow(hwnd, 0) as *const vk::c_void; let hwnd = window.get_hwnd() as HWND;
let hinstance = GetWindow(hwnd, 0) as *const vk::c_void;
let win32_create_info = vk::Win32SurfaceCreateInfoKHR { let win32_create_info = vk::Win32SurfaceCreateInfoKHR {
s_type: vk::StructureType::Win32SurfaceCreateInfoKhr, s_type: vk::StructureType::Win32SurfaceCreateInfoKhr,
p_next: ptr::null(), p_next: ptr::null(),