diff --git a/Cargo.lock b/Cargo.lock index 22e7531cc..4281565f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -465,7 +465,7 @@ dependencies = [ [[package]] name = "gfx-auxil" version = "0.8.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "fxhash", "gfx-hal", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx11" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "arrayvec", "bitflags", @@ -496,7 +496,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "arrayvec", "bit-set", @@ -517,7 +517,7 @@ dependencies = [ [[package]] name = "gfx-backend-empty" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "gfx-hal", "log", @@ -527,7 +527,7 @@ dependencies = [ [[package]] name = "gfx-backend-gl" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "arrayvec", "bitflags", @@ -550,7 +550,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "arrayvec", "bitflags", @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "arrayvec", "ash", @@ -595,7 +595,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.7.0" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" dependencies = [ "bitflags", "naga", @@ -617,8 +617,8 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.4.0" -source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=560ad651aa8f7aefcee8f5bcf41e67a84561bcda#560ad651aa8f7aefcee8f5bcf41e67a84561bcda" +version = "0.4.2" +source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6#2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6" dependencies = [ "bitflags", "gpu-alloc-types", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "gpu-alloc-types" version = "0.2.1" -source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=560ad651aa8f7aefcee8f5bcf41e67a84561bcda#560ad651aa8f7aefcee8f5bcf41e67a84561bcda" +source = "git+https://github.com/zakarumych/gpu-alloc.git?rev=2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6#2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6" dependencies = [ "bitflags", ] @@ -1171,7 +1171,7 @@ dependencies = [ [[package]] name = "range-alloc" version = "0.1.2" -source = "git+https://github.com/gfx-rs/gfx?rev=2a93d52661aafcbd6441ea83e739c8ced906cd21#2a93d52661aafcbd6441ea83e739c8ced906cd21" +source = "git+https://github.com/gfx-rs/gfx?rev=3ee1ca9ba486b166a52765024d8d149cbb28d486#3ee1ca9ba486b166a52765024d8d149cbb28d486" [[package]] name = "raw-window-handle" diff --git a/wgpu-core/src/binding_model.rs b/wgpu-core/src/binding_model.rs index 0d4f0ec9d..2ea1d8f1f 100644 --- a/wgpu-core/src/binding_model.rs +++ b/wgpu-core/src/binding_model.rs @@ -10,7 +10,7 @@ use crate::{ hub::Resource, id::{BindGroupLayoutId, BufferId, DeviceId, SamplerId, TextureViewId, Valid}, memory_init_tracker::MemoryInitTrackerAction, - track::{TrackerSet, DUMMY_SELECTOR}, + track::{TrackerSet, UsageConflict, DUMMY_SELECTOR}, validation::{MissingBufferUsageError, MissingTextureUsageError}, FastHashMap, Label, LifeGuard, MultiRefCount, Stored, MAX_BIND_GROUPS, }; @@ -136,6 +136,8 @@ pub enum CreateBindGroupError { DepthStencilAspect, #[error("the adapter does not support simultaneous read + write storage texture access for the format {0:?}")] StorageReadWriteNotSupported(wgt::TextureFormat), + #[error(transparent)] + ResourceUsageConflict(#[from] UsageConflict), } #[derive(Clone, Debug, Error)] diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs index 7a3f0032c..c0dc45ad0 100644 --- a/wgpu-core/src/command/render.rs +++ b/wgpu-core/src/command/render.rs @@ -972,7 +972,7 @@ impl<'a, B: GfxBackend> RenderPassInfo<'a, B> { ra.selector.clone(), ra.new_use, ) - .unwrap(); + .map_err(UsageConflict::from)?; if let Some(usage) = ra.previous_use { // Make the attachment tracks to be aware of the internal diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index a006767ff..a57f80f76 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -11,7 +11,7 @@ use crate::{ id, instance, memory_init_tracker::{MemoryInitKind, MemoryInitTracker, MemoryInitTrackerAction}, pipeline, resource, swap_chain, - track::{BufferState, TextureSelector, TextureState, TrackerSet}, + track::{BufferState, TextureSelector, TextureState, TrackerSet, UsageConflict}, validation::{self, check_buffer_usage, check_texture_usage}, FastHashMap, Label, LabelHelpers, LifeGuard, MultiRefCount, PrivateFeatures, Stored, SubmissionIndex, MAX_BIND_GROUPS, @@ -1559,7 +1559,7 @@ impl Device { view.selector.clone(), internal_use, ) - .unwrap(); + .map_err(UsageConflict::from)?; check_texture_usage(texture.usage, pub_usage)?; let image_layout = conv::map_texture_state(internal_use, view.aspects).1; @@ -1623,7 +1623,7 @@ impl Device { view.selector.clone(), internal_use, ) - .unwrap(); + .map_err(UsageConflict::from)?; check_texture_usage(texture.usage, pub_usage)?; let image_layout = conv::map_texture_state(internal_use, view.aspects).1; diff --git a/wgpu-core/src/track/mod.rs b/wgpu-core/src/track/mod.rs index bf9c39050..9313fc17d 100644 --- a/wgpu-core/src/track/mod.rs +++ b/wgpu-core/src/track/mod.rs @@ -142,6 +142,15 @@ impl PendingTransition { } } +impl From> for UsageConflict { + fn from(e: PendingTransition) -> Self { + Self::Buffer { + id: e.id.0, + combined_use: e.usage.end, + } + } +} + impl PendingTransition { /// Produce the gfx-hal barrier corresponding to the transition. pub fn into_hal<'a, B: hal::Backend>( @@ -167,6 +176,17 @@ impl PendingTransition { } } +impl From> for UsageConflict { + fn from(e: PendingTransition) -> Self { + Self::Texture { + id: e.id.0, + mip_levels: e.selector.levels.start as u32..e.selector.levels.end as u32, + array_layers: e.selector.layers.start as u32..e.selector.layers.end as u32, + combined_use: e.usage.end, + } + } +} + #[derive(Clone, Debug, Error)] pub enum UseExtendError { #[error("resource is invalid")] @@ -607,20 +627,8 @@ impl TrackerSet { /// Merge all the trackers of another instance by extending /// the usage. Panics on a conflict. pub fn merge_extend(&mut self, other: &Self) -> Result<(), UsageConflict> { - self.buffers - .merge_extend(&other.buffers) - .map_err(|e| UsageConflict::Buffer { - id: e.id.0, - combined_use: e.usage.end, - })?; - self.textures - .merge_extend(&other.textures) - .map_err(|e| UsageConflict::Texture { - id: e.id.0, - mip_levels: e.selector.levels.start as u32..e.selector.levels.end as u32, - array_layers: e.selector.layers.start as u32..e.selector.layers.end as u32, - combined_use: e.usage.end, - })?; + self.buffers.merge_extend(&other.buffers)?; + self.textures.merge_extend(&other.textures)?; self.views.merge_extend(&other.views).unwrap(); self.bind_groups.merge_extend(&other.bind_groups).unwrap(); self.samplers.merge_extend(&other.samplers).unwrap();