github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[core] Make insert_or_merge a method of BufferUsageScope.

Browse Source 
Change `wgpu_core::track::buffer::insert_or_merge` into a
method of `BufferUsageScope`, replacing three arguments with `self`.
This commit is contained in:
Jim Blandy
2024-11-26 16:10:21 -08:00
committed by Connor Fitzgerald
parent eaa5fea40d
commit 8fce9f6191
1 changed files with 48 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
wgpu-core/src/track/buffer.rs
View File

@@ -134,10 +134,7 @@ impl BufferUsageScope {
let index = resource.tracker_index().as_usize();
unsafe {
insert_or_merge(
None,
&mut self.state,
&mut self.metadata,
self.insert_or_merge(
index as _,
index,
BufferStateProvider::Direct { state },
@@ -170,10 +167,7 @@ impl BufferUsageScope {
scope.tracker_assert_in_bounds(index);
unsafe {
insert_or_merge(
None,
&mut self.state,
&mut self.metadata,
self.insert_or_merge(
index as u32,
index,
BufferStateProvider::Indirect {
@@ -208,10 +202,7 @@ impl BufferUsageScope {
self.tracker_assert_in_bounds(index);
unsafe {
insert_or_merge(
None,
&mut self.state,
&mut self.metadata,
self.insert_or_merge(
index as _,
index,
BufferStateProvider::Direct { state: new_state },
@@ -221,6 +212,51 @@ impl BufferUsageScope {
Ok(())
}
/// Does an insertion operation if the index isn't tracked
/// in the current metadata, otherwise merges the given state
/// with the current state. If the merging would cause
/// a conflict, returns that usage conflict.
///
/// # Safety
///
/// Indexes must be valid indexes into all arrays passed in
/// to this function, either directly or via metadata or provider structs.
#[inline(always)]
unsafe fn insert_or_merge(
&mut self,
index32: u32,
index: usize,
state_provider: BufferStateProvider<'_>,
metadata_provider: ResourceMetadataProvider<'_, Arc<Buffer>>,
) -> Result<(), ResourceUsageCompatibilityError> {
let currently_owned = unsafe { self.metadata.contains_unchecked(index) };
if !currently_owned {
unsafe {
insert(
None,
&mut self.state,
&mut self.metadata,
index,
state_provider,
None,
metadata_provider,
)
};
return Ok(());
}
unsafe {
merge(
&mut self.state,
index32,
index,
state_provider,
metadata_provider,
)
}
}
}
/// Stores all buffer state within a command buffer.
@@ -644,53 +680,6 @@ impl BufferStateProvider<'_> {
}
}
/// Does an insertion operation if the index isn't tracked
/// in the current metadata, otherwise merges the given state
/// with the current state. If the merging would cause
/// a conflict, returns that usage conflict.
///
/// # Safety
///
/// Indexes must be valid indexes into all arrays passed in
/// to this function, either directly or via metadata or provider structs.
#[inline(always)]
unsafe fn insert_or_merge(
start_states: Option<&mut [BufferUses]>,
current_states: &mut [BufferUses],
resource_metadata: &mut ResourceMetadata<Arc<Buffer>>,
index32: u32,
index: usize,
state_provider: BufferStateProvider<'_>,
metadata_provider: ResourceMetadataProvider<'_, Arc<Buffer>>,
) -> Result<(), ResourceUsageCompatibilityError> {
let currently_owned = unsafe { resource_metadata.contains_unchecked(index) };
if !currently_owned {
unsafe {
insert(
start_states,
current_states,
resource_metadata,
index,
state_provider,
None,
metadata_provider,
)
};
return Ok(());
}
unsafe {
merge(
current_states,
index32,
index,
state_provider,
metadata_provider,
)
}
}
#[inline(always)]
unsafe fn insert<T: Clone>(
start_states: Option<&mut [BufferUses]>,