Implement override-expression evaluation

naga/src/arena.rs

@@ -122,6 +122,7 @@ impl<T> Handle<T> {
     serde(transparent)
 )]
 #[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct Range<T> {
     inner: ops::Range<u32>,
     #[cfg_attr(any(feature = "serialize", feature = "deserialize"), serde(skip))]
@@ -140,6 +141,7 @@ impl<T> Range<T> {
 
 // NOTE: Keep this diagnostic in sync with that of [`BadHandle`].
 #[derive(Clone, Debug, thiserror::Error)]
+#[cfg_attr(test, derive(PartialEq))]
 #[error("Handle range {range:?} of {kind} is either not present, or inaccessible yet")]
 pub struct BadRangeError {
     // This error is used for many `Handle` types, but there's no point in making this generic, so

naga/src/back/glsl/mod.rs

@@ -2395,7 +2395,7 @@ impl<'a, W: Write> Writer<'a, W> {
     fn write_const_expr(&mut self, expr: Handle<crate::Expression>) -> BackendResult {
         self.write_possibly_const_expr(
             expr,
-            &self.module.const_expressions,
+            &self.module.global_expressions,
             |expr| &self.info[expr],
             |writer, expr| writer.write_const_expr(expr),
         )

naga/src/back/hlsl/mod.rs

@@ -256,7 +256,7 @@ pub enum Error {
     #[error("{0}")]
     Custom(String),
     #[error(transparent)]
-    PipelineConstant(#[from] back::pipeline_constants::PipelineConstantError),
+    PipelineConstant(#[from] Box<back::pipeline_constants::PipelineConstantError>),
 }
 
 #[derive(Default)]

naga/src/back/hlsl/writer.rs

@@ -185,9 +185,14 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
         module_info: &valid::ModuleInfo,
         pipeline_options: &PipelineOptions,
     ) -> Result<super::ReflectionInfo, Error> {
-        let module =
-            back::pipeline_constants::process_overrides(module, &pipeline_options.constants)?;
+        let (module, module_info) = back::pipeline_constants::process_overrides(
+            module,
+            module_info,
+            &pipeline_options.constants,
+        )
+        .map_err(Box::new)?;
         let module = module.as_ref();
+        let module_info = module_info.as_ref();
 
         self.reset(module);
 
@@ -254,7 +259,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
 
         self.write_special_functions(module)?;
 
-        self.write_wrapped_compose_functions(module, &module.const_expressions)?;
+        self.write_wrapped_compose_functions(module, &module.global_expressions)?;
 
         // Write all named constants
         let mut constants = module
@@ -2018,7 +2023,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
         self.write_possibly_const_expression(
             module,
             expr,
-            &module.const_expressions,
+            &module.global_expressions,
             |writer, expr| writer.write_const_expression(module, expr),
         )
     }

naga/src/back/msl/mod.rs

@@ -144,7 +144,7 @@ pub enum Error {
     #[error("ray tracing is not supported prior to MSL 2.3")]
     UnsupportedRayTracing,
     #[error(transparent)]
-    PipelineConstant(#[from] crate::back::pipeline_constants::PipelineConstantError),
+    PipelineConstant(#[from] Box<crate::back::pipeline_constants::PipelineConstantError>),
 }
 
 #[derive(Clone, Debug, PartialEq, thiserror::Error)]

naga/src/back/msl/writer.rs

@@ -1227,7 +1227,7 @@ impl<W: Write> Writer<W> {
     ) -> BackendResult {
         self.put_possibly_const_expression(
             expr_handle,
-            &module.const_expressions,
+            &module.global_expressions,
             module,
             mod_info,
             &(module, mod_info),
@@ -3119,9 +3119,11 @@ impl<W: Write> Writer<W> {
         options: &Options,
         pipeline_options: &PipelineOptions,
     ) -> Result<TranslationInfo, Error> {
-        let module =
-            back::pipeline_constants::process_overrides(module, &pipeline_options.constants)?;
+        let (module, info) =
+            back::pipeline_constants::process_overrides(module, info, &pipeline_options.constants)
+                .map_err(Box::new)?;
         let module = module.as_ref();
+        let info = info.as_ref();
 
         self.names.clear();
         self.namer.reset(