mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 22:11:01 +01:00
Update ash to 0.34 (#2313)
This commit is contained in:
1 parent
afb378292d
commit
191fa9d9f2
7 files changed
+12
-12
No files matched your search
Generated
+2
-2
@@ -43,9 +43,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ash"
|
||||
version = "0.33.3+1.2.191"
|
||||
version = "0.34.0+1.2.203"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc4f1d82f164f838ae413296d1131aa6fa79b917d25bebaa7033d25620c09219"
|
||||
checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df"
|
||||
dependencies = [
|
||||
"libloading",
|
||||
]
|
||||
|
||||
+1
-1
@@ -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 }
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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)?,
|
||||
})
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user