diff --git a/wgpu-core/src/command/mod.rs b/wgpu-core/src/command/mod.rs index c493da459..5fd471942 100644 --- a/wgpu-core/src/command/mod.rs +++ b/wgpu-core/src/command/mod.rs @@ -296,6 +296,7 @@ impl> Global { &texture.life_guard.ref_count, view.range.clone(), TextureUsage::OUTPUT_ATTACHMENT, + &texture.full_range, ); barriers.extend(pending.map(|pending| { @@ -363,6 +364,7 @@ impl> Global { &texture.life_guard.ref_count, view.range.clone(), TextureUsage::OUTPUT_ATTACHMENT, + &texture.full_range, ); barriers.extend(pending.map(|pending| { log::trace!("\tcolor {:?}", pending); @@ -445,6 +447,7 @@ impl> Global { &texture.life_guard.ref_count, view.range.clone(), TextureUsage::OUTPUT_ATTACHMENT, + &texture.full_range, ); barriers.extend(pending.map(|pending| { log::trace!("\tresolve {:?}", pending); diff --git a/wgpu-core/src/device.rs b/wgpu-core/src/device.rs index ba90a39e9..d33daaacb 100644 --- a/wgpu-core/src/device.rs +++ b/wgpu-core/src/device.rs @@ -662,6 +662,7 @@ impl Device { usage: desc.usage, memory, size: desc.size, + full_range: (), mapped_write_ranges: Vec::new(), pending_map_operation: None, life_guard: LifeGuard::new(), @@ -2015,7 +2016,7 @@ impl Global { let mut token = Token::root(); let (device_guard, mut token) = hub.devices.read(&mut token); - let (device_id, ref_count) = { + let (device_id, ref_count, full_range) = { let (mut buffer_guard, _) = hub.buffers.write(&mut token); let buffer = &mut buffer_guard[buffer_id]; @@ -2033,7 +2034,7 @@ impl Global { } buffer.pending_map_operation = Some(operation); - (buffer.device_id.value, buffer.life_guard.ref_count.clone()) + (buffer.device_id.value, buffer.life_guard.ref_count.clone(), buffer.full_range) }; let device = &device_guard[device_id]; @@ -2042,7 +2043,7 @@ impl Global { .trackers .lock() .buffers - .change_replace(buffer_id, &ref_count, (), usage); + .change_replace(buffer_id, &ref_count, (), usage, &full_range); device.pending.lock().map(buffer_id, ref_count); } diff --git a/wgpu-core/src/resource.rs b/wgpu-core/src/resource.rs index 5314f97c3..bb69ed498 100644 --- a/wgpu-core/src/resource.rs +++ b/wgpu-core/src/resource.rs @@ -93,6 +93,7 @@ pub struct Buffer { pub(crate) usage: BufferUsage, pub(crate) memory: MemoryBlock, pub(crate) size: BufferAddress, + pub(crate) full_range: (), pub(crate) mapped_write_ranges: Vec>, pub(crate) pending_map_operation: Option, pub(crate) life_guard: LifeGuard, diff --git a/wgpu-core/src/track/buffer.rs b/wgpu-core/src/track/buffer.rs index ce90022b3..62d48cb16 100644 --- a/wgpu-core/src/track/buffer.rs +++ b/wgpu-core/src/track/buffer.rs @@ -16,19 +16,17 @@ impl PendingTransition { } } -impl Default for BufferState { - fn default() -> Self { +impl ResourceState for BufferState { + type Id = BufferId; + type Selector = (); + type Usage = BufferUsage; + + fn new(_full_selector: &Self::Selector) -> Self { BufferState { init: BufferUsage::empty(), last: BufferUsage::empty(), } } -} - -impl ResourceState for BufferState { - type Id = BufferId; - type Selector = (); - type Usage = BufferUsage; fn query(&self, _selector: Self::Selector) -> Option { Some(self.last) diff --git a/wgpu-core/src/track/mod.rs b/wgpu-core/src/track/mod.rs index e0af127b5..6291d7b13 100644 --- a/wgpu-core/src/track/mod.rs +++ b/wgpu-core/src/track/mod.rs @@ -73,7 +73,7 @@ pub enum Stitch { /// The main trait that abstracts away the tracking logic of /// a particular resource type, like a buffer or a texture. -pub trait ResourceState: Clone + Default { +pub trait ResourceState: Clone { /// Corresponding `HUB` identifier. type Id: Copy + Debug + TypedId; /// A type specifying the sub-resources. @@ -81,6 +81,9 @@ pub trait ResourceState: Clone + Default { /// Usage type for a `Unit` of a sub-resource. type Usage: Debug; + /// Create a new resource state to track the specified subresources. + fn new(full_selector: &Self::Selector) -> Self; + /// Check if all the selected sub-resources have the same /// usage, and return it. /// @@ -215,7 +218,7 @@ impl ResourceTracker { selector: S::Selector, default: S::Usage, ) -> bool { - let mut state = S::default(); + let mut state = S::new(&selector); match state.change(id, selector, default, None) { Ok(()) => (), Err(_) => unreachable!(), @@ -254,13 +257,14 @@ impl ResourceTracker { map: &'a mut FastHashMap>, id: S::Id, ref_count: &RefCount, + full_selector: &S::Selector, ) -> &'a mut Resource { let (index, epoch, backend) = id.unzip(); debug_assert_eq!(self_backend, backend); match map.entry(index) { Entry::Vacant(e) => e.insert(Resource { ref_count: ref_count.clone(), - state: S::default(), + state: S::new(full_selector), epoch, }), Entry::Occupied(e) => { @@ -279,8 +283,9 @@ impl ResourceTracker { ref_count: &RefCount, selector: S::Selector, usage: S::Usage, + full_selector: &S::Selector, ) -> Result<(), PendingTransition> { - Self::get_or_insert(self.backend, &mut self.map, id, ref_count) + Self::get_or_insert(self.backend, &mut self.map, id, ref_count, full_selector) .state .change(id, selector, usage, None) } @@ -292,8 +297,9 @@ impl ResourceTracker { ref_count: &RefCount, selector: S::Selector, usage: S::Usage, + full_selector: &S::Selector, ) -> Drain> { - let res = Self::get_or_insert(self.backend, &mut self.map, id, ref_count); + let res = Self::get_or_insert(self.backend, &mut self.map, id, ref_count, full_selector); res.state .change(id, selector, usage, Some(&mut self.temp)) .ok(); //TODO: unwrap? @@ -359,7 +365,7 @@ impl ResourceTracker { usage: S::Usage, ) -> Result<&'a T, S::Usage> { let item = &storage[id]; - self.change_extend(id, item.borrow(), selector, usage) + self.change_extend(id, item.borrow(), selector, usage, item.borrow()) .map(|()| item) .map_err(|pending| pending.usage.start) } @@ -376,7 +382,7 @@ impl ResourceTracker { usage: S::Usage, ) -> (&'a T, Drain>) { let item = &storage[id]; - let drain = self.change_replace(id, item.borrow(), selector, usage); + let drain = self.change_replace(id, item.borrow(), selector, usage, item.borrow()); (item, drain) } } @@ -387,6 +393,10 @@ impl ResourceState for PhantomData { type Selector = (); type Usage = (); + fn new(_full_selector: &Self::Selector) -> Self { + PhantomData + } + fn query(&self, _selector: Self::Selector) -> Option { Some(()) } diff --git a/wgpu-core/src/track/texture.rs b/wgpu-core/src/track/texture.rs index 3a0b23c65..3d6e0bd2a 100644 --- a/wgpu-core/src/track/texture.rs +++ b/wgpu-core/src/track/texture.rs @@ -21,7 +21,7 @@ struct MipState { stencil: PlaneStates, } -#[derive(Clone, Debug, Default)] +#[derive(Clone, Debug)] pub struct TextureState { mips: ArrayVec<[MipState; MAX_MIP_LEVELS]>, } @@ -70,6 +70,14 @@ impl ResourceState for TextureState { type Selector = hal::image::SubresourceRange; type Usage = TextureUsage; + fn new(full_selector: &Self::Selector) -> Self { + TextureState { + mips: (0 .. full_selector.levels.end) + .map(|_| MipState::default()) + .collect(), + } + } + fn query(&self, selector: Self::Selector) -> Option { let mut result = None; let num_levels = self.mips.len(); @@ -104,9 +112,6 @@ impl ResourceState for TextureState { usage: Self::Usage, mut output: Option<&mut Vec>>, ) -> Result<(), PendingTransition> { - while self.mips.len() < selector.levels.end as usize { - self.mips.push(MipState::default()); - } for (mip_id, mip) in self.mips [selector.levels.start as usize .. selector.levels.end as usize] .iter_mut() @@ -244,7 +249,11 @@ mod test { #[test] fn query() { - let mut ts = TextureState::default(); + let mut ts = TextureState::new(&SubresourceRange { + aspects: Aspects::all(), + levels: 0 .. 10, + layers: 0 .. 10, + }); ts.mips.push(MipState::default()); ts.mips.push(MipState::default()); ts.mips[1].color = PlaneStates::new(&[