Update ash to 0.34 (gfx-rs#2313)

kvark · Dec 29, 2021 · 5013130 · 5013130
1 parent 77e21d9
commit 5013130
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -37,7 +37,7 @@ block = { version = "0.1", optional = true }
 foreign-types = { version = "0.3", optional = true }
 
 # backend: Vulkan
-ash = { version = "0.33", optional = true }
+ash = { version = "0.34", optional = true, default-features = false, features = ["debug", "loaded"] }
 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/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs
@@ -1116,8 +1116,8 @@ impl super::Adapter {
  let timeline_semaphore_fn = if enabled_extensions.contains(&khr::TimelineSemaphore::name())
  {
  Some(super::ExtensionFn::Extension(khr::TimelineSemaphore::new(
- &self.instance.entry,
  &self.instance.raw,
+ &raw_device,
  )))
  } else if self.phd_capabilities.properties.api_version >= vk::API_VERSION_1_2 {
  Some(super::ExtensionFn::Promoted)

diff --git a/wgpu-hal/src/vulkan/command.rs b/wgpu-hal/src/vulkan/command.rs
@@ -594,9 +594,11 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
  .cmd_set_scissor(self.active, 0, &vk_scissors);
  }
  unsafe fn set_stencil_reference(&mut self, value: u32) {
- self.device
- .raw
- .cmd_set_stencil_reference(self.active, vk::StencilFaceFlags::all(), value);
+ self.device.raw.cmd_set_stencil_reference(
+ self.active,
+ vk::StencilFaceFlags::FRONT_AND_BACK,
+ value,
+ );
  }
  unsafe fn set_blend_constants(&mut self, color: &[f32; 4]) {
  self.device.raw.cmd_set_blend_constants(self.active, color);

diff --git a/wgpu-hal/src/vulkan/device.rs b/wgpu-hal/src/vulkan/device.rs
@@ -1716,7 +1716,7 @@ impl crate::Device<super::Api> for super::Device {
  .values(&values);
  let result = match self.shared.extension_fns.timeline_semaphore {
  Some(super::ExtensionFn::Extension(ref ext)) => {
- ext.wait_semaphores(self.shared.raw.handle(), &vk_info, timeout_us)
+ ext.wait_semaphores(&vk_info, timeout_us)
  }
  Some(super::ExtensionFn::Promoted) => {
  self.shared.raw.wait_semaphores(&vk_info, timeout_us)

diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs
@@ -442,7 +442,7 @@ impl Drop for super::InstanceShared {
 
 impl crate::Instance<super::Api> for super::Instance {
  unsafe fn init(desc: &crate::InstanceDescriptor) -> Result<Self, crate::InstanceError> {
- let entry = match ash::Entry::new() {
+ let entry = match ash::Entry::load() {
  Ok(entry) => entry,
  Err(err) => {
  log::info!("Missing Vulkan entry points: {:?}", err);

diff --git a/wgpu-hal/src/vulkan/mod.rs b/wgpu-hal/src/vulkan/mod.rs
@@ -514,9 +514,7 @@ impl Fence {
  match *self {
  Self::TimelineSemaphore(raw) => unsafe {
  Ok(match *extension.unwrap() {
- ExtensionFn::Extension(ref ext) => {
- ext.get_semaphore_counter_value(device.handle(), raw)?
- }
+ ExtensionFn::Extension(ref ext) => ext.get_semaphore_counter_value(raw)?,
  ExtensionFn::Promoted => device.get_semaphore_counter_value(raw)?,
  })
  },