From df6ce9aa9c69a0026e58306a358680d3ca9b2a38 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Mon, 3 Jan 2022 12:41:20 -0500 Subject: [PATCH] Validate structure resource types --- src/valid/interface.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/valid/interface.rs b/src/valid/interface.rs index 1fabe5f3b..72c6561ab 100644 --- a/src/valid/interface.rs +++ b/src/valid/interface.rs @@ -355,13 +355,7 @@ impl super::Validator { true, ) } - crate::StorageClass::Handle => { - match types[var.ty].inner { - crate::TypeInner::Image { .. } | crate::TypeInner::Sampler { .. } => {} - _ => return Err(GlobalVariableError::InvalidType), - }; - (TypeFlags::empty(), true) - } + crate::StorageClass::Handle => (TypeFlags::empty(), true), crate::StorageClass::Private | crate::StorageClass::WorkGroup => { (TypeFlags::DATA | TypeFlags::SIZED, false) } @@ -378,6 +372,16 @@ impl super::Validator { } }; + let is_handle = var.class == crate::StorageClass::Handle; + let good_type = match types[var.ty].inner { + crate::TypeInner::Struct { .. } => !is_handle, + crate::TypeInner::Image { .. } | crate::TypeInner::Sampler { .. } => is_handle, + _ => false, + }; + if is_resource && !good_type { + return Err(GlobalVariableError::InvalidType); + } + if !type_info.flags.contains(required_type_flags) { return Err(GlobalVariableError::MissingTypeFlags { seen: type_info.flags,