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

Validate constant array sizes

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-01-07 14:30:18 -05:00
committed by Dzmitry Malyshau
parent 3bf7f41068
commit bd998f6c32
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/front/glsl/mod.rs
View File

@@ -14,13 +14,13 @@ use ast::Program;
use lex::Lexer;
mod error;
use error::ParseError;
mod functions;
mod parser;
#[cfg(test)]
mod parser_tests;
mod token;
mod types;
mod variables;
mod functions;
pub fn parse_str(
source: &str,

27
src/proc/validator.rs
View File

@@ -29,6 +29,8 @@ pub enum ConstantError {
InvalidType,
#[error("The component handle {0:?} can not be resolved")]
UnresolvedComponent(Handle<crate::Constant>),
#[error("The array size handle {0:?} can not be resolved")]
UnresolvedSize(Handle<crate::Constant>),
}
#[derive(Clone, Debug, PartialEq, thiserror::Error)]
@@ -312,7 +314,7 @@ impl Validator {
&self,
handle: Handle<crate::Constant>,
constants: &Arena<crate::Constant>,
_types: &Arena<crate::Type>,
types: &Arena<crate::Type>,
) -> Result<(), ConstantError> {
let con = &constants[handle];
match con.inner {
@@ -321,14 +323,27 @@ impl Validator {
return Err(ConstantError::InvalidType);
}
}
crate::ConstantInner::Composite {
ty: _,
ref components,
} => {
crate::ConstantInner::Composite { ty, ref components } => {
match types[ty].inner {
crate::TypeInner::Array {
size: crate::ArraySize::Dynamic,
..
} => {
return Err(ConstantError::InvalidType);
}
crate::TypeInner::Array {
size: crate::ArraySize::Constant(size_handle),
..
} => {
if handle <= size_handle {
return Err(ConstantError::UnresolvedSize(size_handle));
}
}
_ => {} //TODO
}
if let Some(&comp) = components.iter().find(|&&comp| handle <= comp) {
return Err(ConstantError::UnresolvedComponent(comp));
}
//TODO
}
}
Ok(())