@@ -2,6 +2,7 @@ use super::{compose::validate_compose, FunctionInfo, ModuleInfo, ShaderStages, T
22use crate :: arena:: UniqueArena ;
33use crate :: {
44 arena:: Handle ,
5+ proc,
56 proc:: OverloadSet as _,
67 proc:: { IndexableLengthError , ResolveError } ,
78} ;
@@ -198,9 +199,9 @@ impl super::Validator {
198199 pub ( super ) fn validate_const_expression (
199200 & self ,
200201 handle : Handle < crate :: Expression > ,
201- gctx : crate :: proc:: GlobalCtx ,
202+ gctx : proc:: GlobalCtx ,
202203 mod_info : & ModuleInfo ,
203- global_expr_kind : & crate :: proc:: ExpressionKindTracker ,
204+ global_expr_kind : & proc:: ExpressionKindTracker ,
204205 ) -> Result < ( ) , ConstExpressionError > {
205206 use crate :: Expression as E ;
206207
@@ -243,7 +244,7 @@ impl super::Validator {
243244 module : & crate :: Module ,
244245 info : & FunctionInfo ,
245246 mod_info : & ModuleInfo ,
246- expr_kind : & crate :: proc:: ExpressionKindTracker ,
247+ expr_kind : & proc:: ExpressionKindTracker ,
247248 ) -> Result < ShaderStages , ExpressionError > {
248249 use crate :: { Expression as E , Scalar as Sc , ScalarKind as Sk , TypeInner as Ti } ;
249250
@@ -293,16 +294,16 @@ impl super::Validator {
293294 } ?;
294295 // If we know both the length and the index, we can do the
295296 // bounds check now.
296- if let crate :: proc:: IndexableLength :: Known ( known_length) = length {
297+ if let proc:: IndexableLength :: Known ( known_length) = length {
297298 if value >= known_length {
298299 return Err ( ExpressionError :: IndexOutOfBounds ( base, value) ) ;
299300 }
300301 }
301302 }
302- Err ( crate :: proc:: U32EvalError :: Negative ) => {
303+ Err ( proc:: U32EvalError :: Negative ) => {
303304 return Err ( ExpressionError :: NegativeIndex ( base) )
304305 }
305- Err ( crate :: proc:: U32EvalError :: NonConst ) => { }
306+ Err ( proc:: U32EvalError :: NonConst ) => { }
306307 }
307308
308309 ShaderStages :: all ( )
0 commit comments