fix(core): Derive TextureInitRange from TextureView

Derive `TextureInitRange` from `TextureView`, rather than
`TextureSelector`. Unambiguous conversion requires knowing
whether the texture is 3D.

(cherry picked from commit 0bffa87506)
This commit is contained in:
Andy Leiserson committed 2026-09-08 11:33:46 -07:00
1 parent 0286689bbc
commit 20167af180
2 files changed
+16 -11

No files matched your search

+5 -5
View File
@@ -1127,7 +1127,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,
},
@@ -1136,7 +1136,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 {
@@ -1310,7 +1310,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,
}),
);
@@ -1328,7 +1328,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((
@@ -1557,7 +1557,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));
+11 -6
View File
@@ -1,9 +1,8 @@
use super::{InitTracker, MemoryInitKind};
use crate::resource::Texture;
use crate::resource::{Texture, TextureView};
use alloc::{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<T>(
|| copy_info.aspect != wgt::TextureAspect::All
}
impl From<TextureSelector> 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,
}
}
}