From d45e6b4119a2354b9eef2bf075c5fd36282e0024 Mon Sep 17 00:00:00 2001 From: Alphyr <47725341+a1phyr@users.noreply.github.com> Date: Mon, 28 Mar 2022 07:15:58 +0200 Subject: [PATCH] Update `ash` to `0.37` (#2557) --- .github/workflows/ci.yml | 2 +- Cargo.lock | 4 ++-- README.md | 2 +- wgpu-hal/Cargo.toml | 3 ++- wgpu-hal/src/vulkan/instance.rs | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfae111931..a584390e06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: env: RUST_BACKTRACE: 1 - RUST_VERSION: 1.53 + RUST_VERSION: 1.59 # We distinguish the following kinds of builds: # - local: build for the same target as we compile on, and do local tests diff --git a/Cargo.lock b/Cargo.lock index 9cdcedba6d..286aa96d08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "ash" -version = "0.35.0+1.2.203" +version = "0.37.0+1.3.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7638ce84f8c84d6fd6faa63aa267574d345181ba591c0eeb5550d4c30cd600" +checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6" dependencies = [ "libloading", ] diff --git a/README.md b/README.md index 49b890b547..fb140d9f51 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For an overview of all the components in the gfx-rs ecosystem, see [the big pict ### MSRV policy -Minimum Supported Rust Version is **1.53**. +Minimum Supported Rust Version is **1.59**. It is enforced on CI (in "/.github/workflows/ci.yml") with `RUST_VERSION` variable. This version can only be upgraded in breaking releases. diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index fb1fd1560b..25deabbc19 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -8,6 +8,7 @@ homepage = "https://github.com/gfx-rs/wgpu" repository = "https://github.com/gfx-rs/wgpu" keywords = ["graphics"] license = "MIT OR Apache-2.0" +rust-version = "1.59" [lib] @@ -46,7 +47,7 @@ block = { version = "0.1", optional = true } foreign-types = { version = "0.3", optional = true } # backend: Vulkan -ash = { version = "0.35", optional = true } +ash = { version = "0.37", optional = true } gpu-alloc = { version = "0.5", optional = true } gpu-descriptor = { version = "0.2", optional = true } inplace_it = { version ="0.3.3", optional = true } diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs index 2370c62eee..6dff2fd485 100644 --- a/wgpu-hal/src/vulkan/instance.rs +++ b/wgpu-hal/src/vulkan/instance.rs @@ -138,7 +138,7 @@ impl super::Instance { flags: crate::InstanceFlags, ) -> Result, crate::InstanceError> { let instance_extensions = entry - .enumerate_instance_extension_properties() + .enumerate_instance_extension_properties(None) .map_err(|e| { log::info!("enumerate_instance_extension_properties: {:?}", e); crate::InstanceError