nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-29 02:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate against cube storage textures (#1846)

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-08-23 02:17:28 -04:00 committed by Dzmitry Malyshau
parent 53cac6046f
commit 0054d8cc53
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu-core/src/binding_model.rs
View File

@ -25,6 +25,8 @@ use thiserror::Error;
#[derive(Clone, Debug, Error)] #[derive(Clone, Debug, Error)]
pub enum BindGroupLayoutEntryError { pub enum BindGroupLayoutEntryError {
#[error("cube dimension is not expected for texture storage")]
StorageTextureCube,
#[error("arrays of bindings unsupported for this type of binding")] #[error("arrays of bindings unsupported for this type of binding")]
ArrayUnsupported, ArrayUnsupported,
#[error(transparent)] #[error(transparent)]

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

@ -1094,25 +1094,40 @@ impl<A: HalApi> Device<A> {
Some(wgt::Features::TEXTURE_BINDING_ARRAY), Some(wgt::Features::TEXTURE_BINDING_ARRAY),
WritableStorage::No, WritableStorage::No,
), ),
Bt::StorageTexture { access, .. } => ( Bt::StorageTexture {
Some( access,
wgt::Features::TEXTURE_BINDING_ARRAY view_dimension,
| wgt::Features::STORAGE_RESOURCE_BINDING_ARRAY, format: _,
), } => {
match access { match view_dimension {
wgt::StorageTextureAccess::WriteOnly => WritableStorage::Yes, wgt::TextureViewDimension::Cube | wgt::TextureViewDimension::CubeArray => {
wgt::StorageTextureAccess::ReadOnly => { return Err(binding_model::CreateBindGroupLayoutError::Entry {
required_features |= binding: entry.binding,
wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES; error: binding_model::BindGroupLayoutEntryError::StorageTextureCube,
WritableStorage::No })
} }
wgt::StorageTextureAccess::ReadWrite => { _ => (),
required_features |= }
wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES; (
WritableStorage::Yes Some(
} wgt::Features::TEXTURE_BINDING_ARRAY
}, | wgt::Features::STORAGE_RESOURCE_BINDING_ARRAY,
), ),
match access {
wgt::StorageTextureAccess::WriteOnly => WritableStorage::Yes,
wgt::StorageTextureAccess::ReadOnly => {
required_features |=
wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES;
WritableStorage::No
}
wgt::StorageTextureAccess::ReadWrite => {
required_features |=
wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES;
WritableStorage::Yes
}
},
)
}
}; };
// Validate the count parameter // Validate the count parameter