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

refactor: factor out new Validator::global_var_ty for expr. validation (#2086)

Browse Source
This commit is contained in:
Erich Gubler
2022-10-25 05:38:44 -10:00
committed by GitHub
parent ddcd5d3121
commit 2a11d830bb
1 changed files with 31 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/valid/expression.rs
View File

@@ -346,57 +346,9 @@ impl super::Validator {
depth_ref,
} => {
// check the validity of expressions
let image_ty = match function.expressions[image] {
crate::Expression::GlobalVariable(var_handle) => {
module.global_variables[var_handle].ty
}
crate::Expression::FunctionArgument(i) => function.arguments[i as usize].ty,
crate::Expression::Access { base, .. }
| crate::Expression::AccessIndex { base, .. } => {
match function.expressions[base] {
crate::Expression::GlobalVariable(var_handle) => {
let array_ty = module.global_variables[var_handle].ty;
let image_ty = Self::global_var_ty(module, function, image)?;
let sampler_ty = Self::global_var_ty(module, function, sampler)?;
match module.types[array_ty].inner {
Ti::BindingArray { base, .. } => base,
_ => {
return Err(ExpressionError::ExpectedBindingArrayType(
array_ty,
))
}
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
};
let sampler_ty = match function.expressions[sampler] {
crate::Expression::GlobalVariable(var_handle) => {
module.global_variables[var_handle].ty
}
crate::Expression::FunctionArgument(i) => function.arguments[i as usize].ty,
crate::Expression::Access { base, .. }
| crate::Expression::AccessIndex { base, .. } => {
match function.expressions[base] {
crate::Expression::GlobalVariable(var_handle) => {
let array_ty = module.global_variables[var_handle].ty;
match module.types[array_ty].inner {
Ti::BindingArray { base, .. } => base,
_ => {
return Err(ExpressionError::ExpectedBindingArrayType(
array_ty,
))
}
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
};
let comparison = match module.types[sampler_ty].inner {
Ti::Sampler { comparison } => comparison,
_ => return Err(ExpressionError::ExpectedSamplerType(sampler_ty)),
@@ -579,31 +531,7 @@ impl super::Validator {
sample,
level,
} => {
let ty = match function.expressions[image] {
crate::Expression::GlobalVariable(var_handle) => {
module.global_variables[var_handle].ty
}
crate::Expression::FunctionArgument(i) => function.arguments[i as usize].ty,
crate::Expression::Access { base, .. }
| crate::Expression::AccessIndex { base, .. } => {
match function.expressions[base] {
crate::Expression::GlobalVariable(var_handle) => {
let array_ty = module.global_variables[var_handle].ty;
match module.types[array_ty].inner {
Ti::BindingArray { base, .. } => base,
_ => {
return Err(ExpressionError::ExpectedBindingArrayType(
array_ty,
))
}
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
};
let ty = Self::global_var_ty(module, function, image)?;
match module.types[ty].inner {
Ti::Image {
class,
@@ -662,31 +590,7 @@ impl super::Validator {
ShaderStages::all()
}
E::ImageQuery { image, query } => {
let ty = match function.expressions[image] {
crate::Expression::GlobalVariable(var_handle) => {
module.global_variables[var_handle].ty
}
crate::Expression::FunctionArgument(i) => function.arguments[i as usize].ty,
crate::Expression::Access { base, .. }
| crate::Expression::AccessIndex { base, .. } => {
match function.expressions[base] {
crate::Expression::GlobalVariable(var_handle) => {
let array_ty = module.global_variables[var_handle].ty;
match module.types[array_ty].inner {
Ti::BindingArray { base, .. } => base,
_ => {
return Err(ExpressionError::ExpectedBindingArrayType(
array_ty,
))
}
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
}
}
_ => return Err(ExpressionError::ExpectedGlobalVariable),
};
let ty = Self::global_var_ty(module, function, image)?;
match module.types[ty].inner {
Ti::Image { class, arrayed, .. } => {
let good = match query {
@@ -1518,4 +1422,31 @@ impl super::Validator {
};
Ok(stages)
}
fn global_var_ty(
module: &crate::Module,
function: &crate::Function,
expr: Handle<crate::Expression>,
) -> Result<Handle<crate::Type>, ExpressionError> {
use crate::Expression as Ex;
match function.expressions[expr] {
Ex::GlobalVariable(var_handle) => Ok(module.global_variables[var_handle].ty),
Ex::FunctionArgument(i) => Ok(function.arguments[i as usize].ty),
Ex::Access { base, .. } | Ex::AccessIndex { base, .. } => {
match function.expressions[base] {
Ex::GlobalVariable(var_handle) => {
let array_ty = module.global_variables[var_handle].ty;
match module.types[array_ty].inner {
crate::TypeInner::BindingArray { base, .. } => Ok(base),
_ => Err(ExpressionError::ExpectedBindingArrayType(array_ty)),
}
}
_ => Err(ExpressionError::ExpectedGlobalVariable),
}
}
_ => Err(ExpressionError::ExpectedGlobalVariable),
}
}
}