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

Filter texture usages on view creation

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-07-06 17:54:04 -04:00
parent 925ece8b40
commit c7519432ee
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wgpu-core/src/device/mod.rs
View File

@@ -728,11 +728,31 @@ impl<A: HalApi> Device<A> {
});
}
// filter the usages based on the other criteria
let usage = {
let mask_copy = !(hal::TextureUses::COPY_SRC | hal::TextureUses::COPY_DST);
let mask_dimension = match view_dim {
wgt::TextureViewDimension::Cube |
wgt::TextureViewDimension::CubeArray => hal::TextureUses::SAMPLED,
wgt::TextureViewDimension::D3 => {
hal::TextureUses::SAMPLED | hal::TextureUses::STORAGE_LOAD | hal::TextureUses::STORAGE_STORE
}
_ => hal::TextureUses::all(),
};
let mask_mip_level = if end_layer != desc.range.base_array_layer + 1 {
hal::TextureUses::SAMPLED
} else {
hal::TextureUses::all()
};
texture.hal_usage & mask_copy & mask_dimension & mask_mip_level
};
log::debug!("Create view for texture {:?} filters usages to {:?}", texture_id, usage);
let hal_desc = hal::TextureViewDescriptor {
label: desc.label.borrow_option(),
format,
dimension: view_dim,
usage: texture.hal_usage, // pass-through
usage,
range: desc.range.clone(),
};

2
wgpu-hal/src/vulkan/device.rs
View File

@@ -725,7 +725,7 @@ impl crate::Device<super::Api> for super::Device {
.subresource_range(conv::map_subresource_range(&desc.range, texture.aspects));
let mut image_view_info;
if self.shared.private_caps.image_view_usage {
if self.shared.private_caps.image_view_usage && !desc.usage.is_empty() {
image_view_info = vk::ImageViewUsageCreateInfo::builder()
.usage(conv::map_texture_usage(desc.usage))
.build();