mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 14:01:08 +01:00
fix: use vk::Fence::null on non-Windows swapchain (#9878)
This commit is contained in:
1 parent
15d817e404
commit
014d9e8481
2 files changed
+38
-26
No files matched your search
@@ -82,6 +82,10 @@ Bottom level categories:
|
||||
|
||||
- Validate that the arguments are within the indirect buffer when encoding an indirect draw to a render bundle. Moves some indirect draw errors from `RenderPassErrorInner` to `RenderCommandError`. By @andyleiserson in [#9871](https://github.com/gfx-rs/wgpu/pull/9871).
|
||||
|
||||
#### Vulkan
|
||||
|
||||
- Stop passing an un-waited fence to `vkAcquireNextImageKHR` on non-Windows platforms, which triggered `VUID-vkAcquireNextImageKHR-fence-10066` validation errors every frame since v30.0.0. By @ErichDonGubler in [#9855](https://github.com/gfx-rs/wgpu/issues/9855).
|
||||
|
||||
#### GLES
|
||||
|
||||
- Fixed signed integer `%` (and `%=`) returning the wrong result for negative operands in the GLSL (OpenGL/GLES) backend, e.g. `-1 % 768` yielding `255` instead of `-1`. GLSL's `%` is undefined when either operand is negative, so signed remainder is now lowered as `a - b * (a / b)`, matching the SPIR-V, HLSL, and Metal backends. By @mstampfli in [#9687](https://github.com/gfx-rs/wgpu/pull/9687).
|
||||
|
||||
@@ -257,12 +257,21 @@ impl Surface for NativeSurface {
|
||||
let images = unsafe { functor.get_swapchain_images(raw) }
|
||||
.map_err(crate::vulkan::map_host_device_oom_err)?;
|
||||
|
||||
let fence = unsafe {
|
||||
device
|
||||
.shared
|
||||
.raw
|
||||
.create_fence(&vk::FenceCreateInfo::default(), None)
|
||||
.map_err(crate::vulkan::map_host_device_oom_err)?
|
||||
// This fence is only used to throttle acquisition on Windows. It is very important to
|
||||
// avoid bad frame pacing when the Vulkan driver is using a DXGI swapchain. See
|
||||
// https://github.com/gfx-rs/wgpu/issues/8310 and
|
||||
// https://github.com/gfx-rs/wgpu/issues/8354 for more details.
|
||||
let fence = if cfg!(target_os = "windows") {
|
||||
let raw = unsafe {
|
||||
device
|
||||
.shared
|
||||
.raw
|
||||
.create_fence(&vk::FenceCreateInfo::default(), None)
|
||||
.map_err(crate::vulkan::map_host_device_oom_err)?
|
||||
};
|
||||
Some(raw)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
// NOTE: It's important that we define the same number of acquire/present semaphores
|
||||
@@ -309,7 +318,7 @@ pub(crate) struct NativeSwapchain {
|
||||
device: Arc<DeviceShared>,
|
||||
images: Vec<vk::Image>,
|
||||
/// Fence used to wait on the acquired image.
|
||||
fence: vk::Fence,
|
||||
fence: Option<vk::Fence>,
|
||||
config: crate::SurfaceConfiguration,
|
||||
|
||||
/// Semaphores used between image acquisition and the first submission
|
||||
@@ -382,7 +391,9 @@ impl Swapchain for NativeSwapchain {
|
||||
};
|
||||
};
|
||||
|
||||
unsafe { device.shared.raw.destroy_fence(self.fence, None) }
|
||||
if let Some(fence) = self.fence {
|
||||
unsafe { device.shared.raw.destroy_fence(fence, None) }
|
||||
}
|
||||
|
||||
// We cannot take this by value, as the function returns `self`.
|
||||
for semaphore in self.acquire_semaphores.drain(..) {
|
||||
@@ -455,6 +466,8 @@ impl Swapchain for NativeSwapchain {
|
||||
return Err(crate::SurfaceError::Timeout);
|
||||
}
|
||||
|
||||
let acquire_fence = self.fence.unwrap_or_else(vk::Fence::null);
|
||||
|
||||
// will block if no image is available
|
||||
let (index, suboptimal) = match unsafe {
|
||||
profiling::scope!("vkAcquireNextImageKHR");
|
||||
@@ -462,7 +475,7 @@ impl Swapchain for NativeSwapchain {
|
||||
self.raw,
|
||||
timeout_ns,
|
||||
acquire_semaphore_guard.acquire,
|
||||
self.fence,
|
||||
acquire_fence,
|
||||
)
|
||||
} {
|
||||
// We treat `VK_SUBOPTIMAL_KHR` as `VK_SUCCESS` on Android.
|
||||
@@ -485,24 +498,19 @@ impl Swapchain for NativeSwapchain {
|
||||
}
|
||||
};
|
||||
|
||||
// Wait for the image was acquired to be fully ready to be rendered too.
|
||||
//
|
||||
// This wait is very important on Windows to avoid bad frame pacing on
|
||||
// Windows where the Vulkan driver is using a DXGI swapchain. See
|
||||
// https://github.com/gfx-rs/wgpu/issues/8310 and
|
||||
// https://github.com/gfx-rs/wgpu/issues/8354 for more details.
|
||||
#[cfg(target_os = "windows")]
|
||||
unsafe {
|
||||
// The `wait_all` argument must be `true` to avoid crash on some Android devices. See https://github.com/gfx-rs/wgpu/pull/8769
|
||||
self.device
|
||||
.raw
|
||||
.wait_for_fences(&[self.fence], true, timeout_ns)
|
||||
.map_err(map_host_device_oom_and_lost_err)?;
|
||||
if let Some(fence) = self.fence {
|
||||
unsafe {
|
||||
// The `wait_all` argument must be `true` to avoid crash on some Android devices. See https://github.com/gfx-rs/wgpu/pull/8769
|
||||
self.device
|
||||
.raw
|
||||
.wait_for_fences(&[fence], true, timeout_ns)
|
||||
.map_err(map_host_device_oom_and_lost_err)?;
|
||||
|
||||
self.device
|
||||
.raw
|
||||
.reset_fences(&[self.fence])
|
||||
.map_err(map_host_device_oom_and_lost_err)?;
|
||||
self.device
|
||||
.raw
|
||||
.reset_fences(&[fence])
|
||||
.map_err(map_host_device_oom_and_lost_err)?;
|
||||
}
|
||||
}
|
||||
|
||||
drop(acquire_semaphore_guard);
|
||||
|
||||
Reference in new issue
Block a user