archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge #947

Browse Source 
947: Update naga with the new usage validation r=cwfitzgerald a=kvark

**Connections**
Includes https://github.com/gfx-rs/naga/pull/200, https://github.com/gfx-rs/naga/pull/203, https://github.com/gfx-rs/naga/pull/214, and others

**Description**
We get more comprehensive validation, which can sometimes be annoying :)

**Testing**
Tested on wgpu-rs examples.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot] 2020-10-01 16:05:42 +00:00 committed by GitHub
commit bcb3162b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -836,7 +836,7 @@ dependencies = [
[[package]]
name = "naga"
version = "0.2.0"
source = "git+https://github.com/gfx-rs/naga?rev=b278e10ea7c144b2387585c4e81c1d86db8e2def#b278e10ea7c144b2387585c4e81c1d86db8e2def"
source = "git+https://github.com/gfx-rs/naga?rev=8323521b838cf7a7cb4163c84f0f4ff237622f9a#8323521b838cf7a7cb4163c84f0f4ff237622f9a"
dependencies = [
"bitflags",
"fxhash",

4
wgpu-core/Cargo.toml
View File

@ -40,8 +40,8 @@ gfx-memory = "0.2"
[dependencies.naga]
version = "0.2"
git = "https://github.com/gfx-rs/naga"
rev = "b278e10ea7c144b2387585c4e81c1d86db8e2def"
features = ["spirv-in", "spirv-out", "wgsl-in"]
rev = "8323521b838cf7a7cb4163c84f0f4ff237622f9a"
features = ["spv-in", "spv-out", "wgsl-in"]
[dependencies.wgt]
path = "../wgpu-types"

81
wgpu-core/src/validation.rs
View File

@ -65,11 +65,6 @@ pub enum BindingError {
dim: naga::ImageDimension,
is_array: bool,
},
#[error("component type {binding:?} of a sampled texture doesn't match the shader {shader:?}")]
WrongTextureComponentType {
binding: naga::ScalarKind,
shader: naga::ScalarKind,
},
#[error("texture class {binding:?} doesn't match the shader {shader:?}")]
WrongTextureClass {
binding: naga::ImageClass,
@ -98,9 +93,9 @@ pub enum StageError {
InvalidModule,
#[error("unable to find an entry point at {0:?} stage")]
MissingEntryPoint(wgt::ShaderStage),
#[error("error matching global binding at index {binding} in set {set} against the pipeline layout: {error}")]
#[error("error matching global binding at index {binding} in group {group} against the pipeline layout: {error}")]
Binding {
set: u32,
group: u32,
binding: u32,
error: BindingError,
},
@ -283,7 +278,6 @@ fn check_binding_use(
_ => Err(BindingError::WrongType),
},
naga::TypeInner::Image {
kind,
dim,
arrayed,
class,
@ -329,7 +323,7 @@ fn check_binding_use(
component_type,
multisampled,
} => {
let (expected_scalar_kind, comparison) = match component_type {
let (kind, comparison) = match component_type {
wgt::TextureComponentType::Float => (naga::ScalarKind::Float, false),
wgt::TextureComponentType::Sint => (naga::ScalarKind::Sint, false),
wgt::TextureComponentType::Uint => (naga::ScalarKind::Uint, false),
@ -337,18 +331,13 @@ fn check_binding_use(
(naga::ScalarKind::Float, true)
}
};
if kind != expected_scalar_kind {
return Err(BindingError::WrongTextureComponentType {
binding: expected_scalar_kind,
shader: kind,
});
}
let class = if multisampled {
naga::ImageClass::Multisampled
} else if comparison {
let class = if comparison {
naga::ImageClass::Depth
} else {
naga::ImageClass::Sampled
naga::ImageClass::Sampled {
kind,
multi: multisampled,
}
};
(class, naga::GlobalUse::LOAD)
}
@ -810,7 +799,6 @@ fn derive_binding_type(
}
naga::TypeInner::Sampler { comparison } => BindingType::Sampler { comparison },
naga::TypeInner::Image {
kind,
dim,
arrayed,
class,
@ -823,22 +811,16 @@ fn derive_binding_type(
naga::ImageDimension::Cube if arrayed => wgt::TextureViewDimension::CubeArray,
naga::ImageDimension::Cube => wgt::TextureViewDimension::Cube,
};
let component_type = match kind {
naga::ScalarKind::Float => wgt::TextureComponentType::Float,
naga::ScalarKind::Sint => wgt::TextureComponentType::Sint,
naga::ScalarKind::Uint => wgt::TextureComponentType::Uint,
naga::ScalarKind::Bool => unreachable!(),
};
match class {
naga::ImageClass::Sampled => BindingType::SampledTexture {
naga::ImageClass::Sampled { multi, kind } => BindingType::SampledTexture {
dimension,
component_type,
multisampled: false,
},
naga::ImageClass::Multisampled => BindingType::SampledTexture {
dimension,
component_type,
multisampled: true,
component_type: match kind {
naga::ScalarKind::Float => wgt::TextureComponentType::Float,
naga::ScalarKind::Sint => wgt::TextureComponentType::Sint,
naga::ScalarKind::Uint => wgt::TextureComponentType::Uint,
naga::ScalarKind::Bool => unreachable!(),
},
multisampled: multi,
},
naga::ImageClass::Depth => BindingType::SampledTexture {
dimension,
@ -871,30 +853,31 @@ pub fn check_stage<'a>(
) -> Result<StageInterface<'a>, StageError> {
// Since a shader module can have multiple entry points with the same name,
// we need to look for one with the right execution model.
let shader_stage = match stage_bit {
wgt::ShaderStage::VERTEX => naga::ShaderStage::Vertex,
wgt::ShaderStage::FRAGMENT => naga::ShaderStage::Fragment,
wgt::ShaderStage::COMPUTE => naga::ShaderStage::Compute,
_ => unreachable!(),
};
let entry_point = module
.entry_points
.iter()
.find(|entry_point| {
entry_point.name == entry_point_name
&& stage_bit.contains(match entry_point.stage {
naga::ShaderStage::Vertex { .. } => wgt::ShaderStage::VERTEX,
naga::ShaderStage::Fragment { .. } => wgt::ShaderStage::FRAGMENT,
naga::ShaderStage::Compute { .. } => wgt::ShaderStage::COMPUTE,
})
})
.get(&(shader_stage, entry_point_name.to_string()))
.ok_or(StageError::MissingEntryPoint(stage_bit))?;
let function = &module.functions[entry_point.function];
let mut outputs = StageInterface::default();
for ((_, var), &usage) in module.global_variables.iter().zip(&function.global_usage) {
for ((_, var), &usage) in module
.global_variables
.iter()
.zip(&entry_point.function.global_usage)
{
if usage.is_empty() {
continue;
}
match var.binding {
Some(naga::Binding::Descriptor { set, binding }) => {
Some(naga::Binding::Resource { group, binding }) => {
let result = match group_layouts {
IntrospectionBindGroupLayouts::Given(ref layouts) => layouts
.get(set as usize)
.get(group as usize)
.and_then(|map| map.get(&binding))
.ok_or(BindingError::Missing)
.and_then(|entry| {
@ -913,7 +896,7 @@ pub fn check_stage<'a>(
}
}),
IntrospectionBindGroupLayouts::Derived(ref mut layouts) => layouts
.get_mut(set as usize)
.get_mut(group as usize)
.ok_or(BindingError::Missing)
.and_then(|set| {
let ty = derive_binding_type(module, var, usage)?;
@ -937,7 +920,7 @@ pub fn check_stage<'a>(
};
if let Err(error) = result {
return Err(StageError::Binding {
set,
group,
binding,
error,
});