From 57430bdc548657a16cc48e220552ca15b02ba858 Mon Sep 17 00:00:00 2001 From: Elabajaba Date: Wed, 7 Dec 2022 22:49:40 -0500 Subject: [PATCH 1/3] update to ash 0.37.1 to fix CI --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- wgpu-hal/src/vulkan/device.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af15368ccb..6eaf916a83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,9 +66,9 @@ dependencies = [ [[package]] name = "ash" -version = "0.37.0+1.3.209" +version = "0.37.1+1.3.235" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6" +checksum = "911015c962d56e2e4052f40182ca5462ba60a3d2ff04e827c365a0ab3d65726d" dependencies = [ "libloading", ] diff --git a/Cargo.toml b/Cargo.toml index f59ca0b920..de7cd03731 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,7 +88,7 @@ objc = "0.2.5" core-graphics-types = "0.1" # Vulkan dependencies -ash = "0.37" +ash = ">=0.37.1,<0.38" gpu-alloc = "0.5" gpu-descriptor = "0.2" android_system_properties = "0.1.1" diff --git a/wgpu-hal/src/vulkan/device.rs b/wgpu-hal/src/vulkan/device.rs index 084be72de9..dafd15f500 100644 --- a/wgpu-hal/src/vulkan/device.rs +++ b/wgpu-hal/src/vulkan/device.rs @@ -52,7 +52,7 @@ impl super::DeviceShared { let name = unsafe { CStr::from_bytes_with_nul_unchecked(name_bytes) }; let _result = unsafe { - extension.debug_utils_set_object_name( + extension.set_debug_utils_object_name( self.raw.handle(), &vk::DebugUtilsObjectNameInfoEXT::builder() .object_type(object_type) From f08fbab48dbcf1ba9e95998cfa2198870e1cc75c Mon Sep 17 00:00:00 2001 From: Elabajaba Date: Wed, 7 Dec 2022 23:02:53 -0500 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71bcdd2cd6..2d4e8bebff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -178,6 +178,10 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non - Let the wgpu examples `framework.rs` compile again under Emscripten. By @jimblandy in [#3246](https://github.com/gfx-rs/wgpu/pull/3246) +#### Vulkan + +- Update ash to 0.37.1+1.3.235 to fix CI breaking by changing a call to the deprecated `debug_utils_set_object_name()` function to `set_debug_utils_object_name()` by @elabajaba in [#3273](https://github.com/gfx-rs/wgpu/pull/3273) + ### Examples - Log adapter info in hello example on wasm target by @JolifantoBambla in [#2858](https://github.com/gfx-rs/wgpu/pull/2858) From f95ad9971bc73d21bf1a8e5b57c7b7024102913b Mon Sep 17 00:00:00 2001 From: Elabajaba Date: Thu, 8 Dec 2022 20:06:07 +0000 Subject: [PATCH 3/3] Use equals for ash version Co-authored-by: Connor Fitzgerald --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index de7cd03731..c61a133c05 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -88,7 +88,7 @@ objc = "0.2.5" core-graphics-types = "0.1" # Vulkan dependencies -ash = ">=0.37.1,<0.38" +ash = "0.37.1" gpu-alloc = "0.5" gpu-descriptor = "0.2" android_system_properties = "0.1.1"