Initialize trackers with full selector - part 2

This commit is contained in:
Dzmitry Malyshau committed 2019-11-18 09:20:16 -05:00
1 parent 0569bc6956
commit 4e57c42c71
6 files changed
+45 -23

No files matched your search

+3
View File
@@ -296,6 +296,7 @@ impl<F: IdentityFilter<RenderPassId>> Global<F> {
&texture.life_guard.ref_count,
view.range.clone(),
TextureUsage::OUTPUT_ATTACHMENT,
&texture.full_range,
);
barriers.extend(pending.map(|pending| {
@@ -363,6 +364,7 @@ impl<F: IdentityFilter<RenderPassId>> Global<F> {
&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<F: IdentityFilter<RenderPassId>> Global<F> {
&texture.life_guard.ref_count,
view.range.clone(),
TextureUsage::OUTPUT_ATTACHMENT,
&texture.full_range,
);
barriers.extend(pending.map(|pending| {
log::trace!("\tresolve {:?}", pending);
+4 -3
View File
@@ -662,6 +662,7 @@ impl<B: GfxBackend> Device<B> {
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<F> Global<F> {
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<F> Global<F> {
}
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<F> Global<F> {
.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);
}
+1
View File
@@ -93,6 +93,7 @@ pub struct Buffer<B: hal::Backend> {
pub(crate) usage: BufferUsage,
pub(crate) memory: MemoryBlock<B>,
pub(crate) size: BufferAddress,
pub(crate) full_range: (),
pub(crate) mapped_write_ranges: Vec<std::ops::Range<u64>>,
pub(crate) pending_map_operation: Option<BufferMapOperation>,
pub(crate) life_guard: LifeGuard,
+6 -8
View File
@@ -16,19 +16,17 @@ impl PendingTransition<BufferState> {
}
}
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<Self::Usage> {
Some(self.last)
+17 -7
View File
@@ -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<S: ResourceState> ResourceTracker<S> {
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<S: ResourceState> ResourceTracker<S> {
map: &'a mut FastHashMap<Index, Resource<S>>,
id: S::Id,
ref_count: &RefCount,
full_selector: &S::Selector,
) -> &'a mut Resource<S> {
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<S: ResourceState> ResourceTracker<S> {
ref_count: &RefCount,
selector: S::Selector,
usage: S::Usage,
full_selector: &S::Selector,
) -> Result<(), PendingTransition<S>> {
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<S: ResourceState> ResourceTracker<S> {
ref_count: &RefCount,
selector: S::Selector,
usage: S::Usage,
full_selector: &S::Selector,
) -> Drain<PendingTransition<S>> {
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<S: ResourceState> ResourceTracker<S> {
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<S: ResourceState> ResourceTracker<S> {
usage: S::Usage,
) -> (&'a T, Drain<PendingTransition<S>>) {
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<I: Copy + Debug + TypedId> ResourceState for PhantomData<I> {
type Selector = ();
type Usage = ();
fn new(_full_selector: &Self::Selector) -> Self {
PhantomData
}
fn query(&self, _selector: Self::Selector) -> Option<Self::Usage> {
Some(())
}
+14 -5
View File
@@ -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<Self::Usage> {
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<PendingTransition<Self>>>,
) -> Result<(), PendingTransition<Self>> {
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(&[