nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-16 17:02:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let the "strict_asserts" feature enable Token::root assertions. (#4258)

Browse Source
This commit is contained in:
Jim Blandy 2023-10-17 20:00:39 -07:00 committed by GitHub
parent 7461781a59
commit da0b3fe685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -101,7 +101,6 @@ By @teoxoy in [#4185](https://github.com/gfx-rs/wgpu/pull/4185)
- Add WinUI 3 SwapChainPanel support. By @ddrboxman in [#4191](https://github.com/gfx-rs/wgpu/pull/4191)
### Changes
#### General
- Omit texture store bound checks since they are no-ops if out of bounds on all APIs. By @teoxoy in [#3975](https://github.com/gfx-rs/wgpu/pull/3975)
@ -117,6 +116,7 @@ By @teoxoy in [#4185](https://github.com/gfx-rs/wgpu/pull/4185)
- Expose instance flags. By @nical in [4230](https://github.com/gfx-rs/wgpu/pull/4230)
- Add support for the bgra8unorm-storage feature. By @jinleili and @nical in [#4228](https://github.com/gfx-rs/wgpu/pull/4228)
- Calls to lost devices now return `DeviceError::Lost` instead of `DeviceError::Invalid`. By @bradwerth in [#4238]([https://github.com/gfx-rs/wgpu/pull/4238])
- Let the `"strict_asserts"` feature enable check that wgpu-core's lock-ordering tokens are unique per thread. By @jimblandy in [#4258]([https://github.com/gfx-rs/wgpu/pull/4258])
#### Vulkan

16
wgpu-core/src/hub.rs
View File

@ -169,7 +169,9 @@ use crate::{
storage::{Element, Storage, StorageReport},
};
#[cfg(debug_assertions)]
use wgt::{strict_assert_eq, strict_assert_ne};
#[cfg(any(debug_assertions, feature = "strict_asserts"))]
use std::cell::Cell;
use std::{fmt::Debug, marker::PhantomData};
@ -281,7 +283,7 @@ impl<A: HalApi> Access<QuerySet<A>> for RenderPipeline<A> {}
impl<A: HalApi> Access<QuerySet<A>> for ComputePipeline<A> {}
impl<A: HalApi> Access<QuerySet<A>> for Sampler<A> {}
#[cfg(debug_assertions)]
#[cfg(any(debug_assertions, feature = "strict_asserts"))]
thread_local! {
/// Per-thread state checking `Token<Root>` creation in debug builds.
///
@ -320,10 +322,10 @@ impl<'a, T> Token<'a, T> {
///
/// This should only be used by `Registry` locking methods.
pub(crate) fn new() -> Self {
#[cfg(debug_assertions)]
#[cfg(any(debug_assertions, feature = "strict_asserts"))]
ACTIVE_TOKEN.with(|active| {
let old = active.get();
assert_ne!(old, 0, "Root token was dropped");
strict_assert_ne!(old, 0, "Root token was dropped");
active.set(old + 1);
});
Self { level: PhantomData }
@ -336,9 +338,9 @@ impl Token<'static, Root> {
/// Debug builds check dynamically that each thread has at most
/// one root token at a time.
pub fn root() -> Self {
#[cfg(debug_assertions)]
#[cfg(any(debug_assertions, feature = "strict_asserts"))]
ACTIVE_TOKEN.with(|active| {
assert_eq!(0, active.replace(1), "Root token is already active");
strict_assert_eq!(0, active.replace(1), "Root token is already active");
});
Self { level: PhantomData }
@ -347,7 +349,7 @@ impl Token<'static, Root> {
impl<'a, T> Drop for Token<'a, T> {
fn drop(&mut self) {
#[cfg(debug_assertions)]
#[cfg(any(debug_assertions, feature = "strict_asserts"))]
ACTIVE_TOKEN.with(|active| {
let old = active.get();
active.set(old - 1);