nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-18 01:43:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[msl] add undocumented checks

Browse Source
This commit is contained in:
teoxoy 2023-09-20 12:29:29 +02:00 committed by Jim Blandy
parent 0cfd2213cc
commit 0340c2e685
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/back/msl/mod.rs
View File

@ -129,6 +129,10 @@ pub enum Error {
CapabilityNotSupported(crate::valid::Capabilities),
#[error("attribute '{0}' is not supported for target MSL version")]
UnsupportedAttribute(String),
#[error("can not use writeable storage buffers in fragment stage prior to MSL 1.2")]
UnsupportedWriteableStorageBuffer,
#[error("can not use writeable storage textures in {0:?} stage prior to MSL 1.2")]
UnsupportedWriteableStorageTexture(crate::ShaderStage),
}
#[derive(Clone, Debug, PartialEq, thiserror::Error)]

29
src/back/msl/writer.rs
View File

@ -3940,6 +3940,35 @@ impl<W: Write> Writer<W> {
let resolved = match var.space {
crate::AddressSpace::PushConstant => options.resolve_push_constants(ep).ok(),
crate::AddressSpace::WorkGroup => None,
// This restriciton is not documented in the MSL spec but validation will fail if not upheld.
// We imply the version check from the "Function Buffer Read-Writes" section of https://developer.apple.com/library/archive/documentation/Miscellaneous/Conceptual/MetalProgrammingGuide/WhatsNewiniOS10tvOS10andOSX1012/WhatsNewiniOS10tvOS10andOSX1012.html
// where the feaure sets listed correspond with the ones supporting MSL 1.2.
crate::AddressSpace::Storage { access }
if access.contains(crate::StorageAccess::STORE)
&& options.lang_version < (1, 2)
&& ep.stage == crate::ShaderStage::Fragment =>
{
return Err(Error::UnsupportedWriteableStorageBuffer)
}
// This restriciton is not documented in the MSL spec but validation will fail if not upheld.
// We imply the version check from the "Function Texture Read-Writes" section of https://developer.apple.com/library/archive/documentation/Miscellaneous/Conceptual/MetalProgrammingGuide/WhatsNewiniOS10tvOS10andOSX1012/WhatsNewiniOS10tvOS10andOSX1012.html
// where the feaure set listed corresponds with the one supporting MSL 1.2.
crate::AddressSpace::Handle
if match module.types[var.ty].inner {
crate::TypeInner::Image {
class: crate::ImageClass::Storage { access, .. },
..
} => {
access.contains(crate::StorageAccess::STORE)
&& options.lang_version < (1, 2)
&& (ep.stage == crate::ShaderStage::Vertex
|| ep.stage == crate::ShaderStage::Fragment)
}
_ => false,
} =>
{
return Err(Error::UnsupportedWriteableStorageTexture(ep.stage))
}
_ => options
.resolve_resource_binding(ep, var.binding.as_ref().unwrap())
.ok(),