mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 14:01:08 +01:00
fix(core): Derive TextureInitRange from TextureView
Derive `TextureInitRange` from `TextureView`, rather than `TextureSelector`. Unambiguous conversion requires knowing whether the texture is 3D.
This commit is contained in:
1 parent
4a4db416c3
commit
0bffa87506
2 files changed
+16
-11
No files matched your search
@@ -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));
|
||||
|
||||
@@ -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<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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user