diff --git a/.travis.yml b/.travis.yml index d964dc870..ab52d8422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,6 +59,8 @@ script: - cargo test - (cd wgpu-native && cargo check --features local,glutin) # TODO: Temporarily only test building the gl backend, properly test when it is usable from C + - if [[ $TRAVIS_OS_NAME == "windows" ]]; then (cd wgpu-native && cargo check --features gfx-backend-dx11); fi + - if [[ $TRAVIS_OS_NAME == "windows" ]]; then (cd wgpu-native && cargo check --features gfx-backend-dx12); fi - if [[ $TRAVIS_OS_NAME == "linux" ]]; then cargo check --release; fi - if [[ $TRAVIS_RUST_VERSION == "nightly" ]]; then cargo +nightly install cbindgen; fi - if [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $TRAVIS_OS_NAME == "windows" ]]; then diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d7bdccb4..fab57f079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## v0.3.3 (22-08-2019) + - fixed instance creation on Windows + ## v0.3.1 (21-08-2019) - fixed pipeline barriers that aren't transitions diff --git a/Cargo.lock b/Cargo.lock index d876266a6..0dc8f5020 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1419,7 +1419,7 @@ dependencies = [ [[package]] name = "wgpu-native" -version = "0.3.1" +version = "0.3.2" dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1449,7 +1449,7 @@ dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", - "wgpu-native 0.3.1", + "wgpu-native 0.3.2", ] [[package]] diff --git a/wgpu-native/Cargo.toml b/wgpu-native/Cargo.toml index 75486f3af..721540676 100644 --- a/wgpu-native/Cargo.toml +++ b/wgpu-native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wgpu-native" -version = "0.3.2" +version = "0.3.3" authors = [ "Dzmitry Malyshau ", "Joshua Groves ", diff --git a/wgpu-native/src/instance.rs b/wgpu-native/src/instance.rs index d5152b30c..64875aa37 100644 --- a/wgpu-native/src/instance.rs +++ b/wgpu-native/src/instance.rs @@ -115,7 +115,7 @@ pub fn wgpu_instance_create_surface( #[cfg(all(windows, feature = "gfx-backend-vulkan"))] raw_window_handle::RawWindowHandle::Windows(h) => instance.create_surface_from_hwnd(std::ptr::null_mut(), h.hwnd), - #[cfg(all(windows, feature = "gfx-backend-dx12"))] + #[cfg(all(windows, feature = "gfx-backend-dx11"))] raw_window_handle::RawWindowHandle::Windows(h) => instance.create_surface_from_hwnd(h.hwnd), #[cfg(all(windows, feature = "gfx-backend-dx12"))]