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

Don't build shader interface without the validation flag

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-01-25 14:13:55 -05:00
parent a97ec9df91
commit 6a684e5cdf
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -962,15 +962,16 @@ impl<B: GfxBackend> Device<B> {
pipeline::ShaderModuleSource::Naga(module) => (None, Some(module)),
};
let interface = module.as_ref().map(|m| validation::Interface::new(m));
let naga_result = match module {
let (naga_result, interface) = match module {
// If succeeded, then validate it and attempt to give it to gfx-hal directly.
Some(module) => {
if desc.flags.contains(wgt::ShaderFlags::VALIDATION) {
let interface = if desc.flags.contains(wgt::ShaderFlags::VALIDATION) {
naga::proc::Validator::new().validate(&module)?;
}
if desc
Some(validation::Interface::new(&module))
} else {
None
};
let naga_result = if desc
.flags
.contains(wgt::ShaderFlags::EXPERIMENTAL_TRANSLATION)
{
@@ -984,9 +985,10 @@ impl<B: GfxBackend> Device<B> {
}
} else {
Err(Some(module))
}
};
(naga_result, interface)
}
None => Err(None),
None => (Err(None), None),
};
// Otherwise, fall back to SPIR-V.
@@ -1954,7 +1956,10 @@ impl<B: GfxBackend> Device<B> {
| wgt::VertexFormat::Double3
| wgt::VertexFormat::Double4 = attribute.format
{
if !self.features.contains(wgt::Features::VERTEX_ATTRIBUTE_64BIT) {
if !self
.features
.contains(wgt::Features::VERTEX_ATTRIBUTE_64BIT)
{
return Err(pipeline::CreateRenderPipelineError::MissingFeature(
wgt::Features::VERTEX_ATTRIBUTE_64BIT,
));