diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs index b92e8c1b7..5fad4b8be 100644 --- a/wgpu-core/src/command/render.rs +++ b/wgpu-core/src/command/render.rs @@ -1148,7 +1148,7 @@ impl RenderPassInfo { pending_discard_init_fixups.extend(texture_memory_actions.register_init_action( &TextureInitTrackerAction { texture: view.parent.clone(), - range: TextureInitRange::from(view.selector.clone()), + range: TextureInitRange::from(view), // Note that this is needed even if the target is discarded, kind: MemoryInitKind::NeedsInitializedMemory, }, @@ -1157,7 +1157,7 @@ impl RenderPassInfo { // Clear + Store texture_memory_actions.register_implicit_init( &view.parent, - TextureInitRange::from(view.selector.clone()), + TextureInitRange::from(view), ); } if store_op == StoreOp::Discard { @@ -1331,7 +1331,7 @@ impl RenderPassInfo { pending_discard_init_fixups.extend( texture_memory_actions.register_init_action(&TextureInitTrackerAction { texture: view.parent.clone(), - range: TextureInitRange::from(view.selector.clone()), + range: TextureInitRange::from(view.as_ref()), kind: MemoryInitKind::NeedsInitializedMemory, }), ); @@ -1349,7 +1349,7 @@ impl RenderPassInfo { if !need_init_beforehand { texture_memory_actions.register_implicit_init( &view.parent, - TextureInitRange::from(view.selector.clone()), + TextureInitRange::from(view.as_ref()), ); } divergent_discarded_depth_stencil_aspect = Some(( @@ -1587,7 +1587,7 @@ impl RenderPassInfo { texture_memory_actions.register_implicit_init( &resolve_view.parent, - TextureInitRange::from(resolve_view.selector.clone()), + TextureInitRange::from(resolve_view.as_ref()), ); render_attachments .push(resolve_view.to_render_attachment(wgt::TextureUses::COLOR_TARGET)); diff --git a/wgpu-core/src/init_tracker/texture.rs b/wgpu-core/src/init_tracker/texture.rs index 454e1d79b..78ea88d08 100644 --- a/wgpu-core/src/init_tracker/texture.rs +++ b/wgpu-core/src/init_tracker/texture.rs @@ -1,9 +1,8 @@ use super::{InitTracker, MemoryInitKind}; -use crate::resource::Texture; +use crate::resource::{Texture, TextureView}; use alloc::{string::String, sync::Arc, vec::Vec}; use arrayvec::ArrayVec; use core::ops::Range; -use wgt::TextureSelector; #[derive(Debug, Clone)] pub(crate) struct TextureInitRange { @@ -28,11 +27,17 @@ pub(crate) fn has_copy_partial_init_tracker_coverage( || copy_info.aspect != wgt::TextureAspect::All } -impl From for TextureInitRange { - fn from(selector: TextureSelector) -> Self { +impl From<&'_ TextureView> for TextureInitRange { + fn from(view: &'_ TextureView) -> Self { + // TextureInitRange is always array layers, never depth slices. + let layer_range = if view.parent.desc.dimension == wgt::TextureDimension::D3 { + 0..1 + } else { + view.selector.layers.clone() + }; TextureInitRange { - mip_range: selector.mips, - layer_range: selector.layers, + mip_range: view.selector.mips.clone(), + layer_range, } } }