Merge branch 'main' into wesl_macro

Author: k2d222

crates/wesl-cli/src/main.rs

@@ -10,8 +10,8 @@ use std::{
     str::FromStr,
 };
 use wesl::{
-    CompileOptions, CompileResult, Diagnostic, Feature, Features, FileResolver, ManglerKind,
-    PkgBuilder, Router, SyntaxUtil, VirtualResolver, Wesl,
+    CompileOptions, CompileResult, Diagnostic, Feature, Features, FileResolver, Inputs,
+    ManglerKind, PkgBuilder, Router, SyntaxUtil, VirtualResolver, Wesl,
     eval::{Eval, EvalAttrs, HostShareable, Instance, RefInstance, Ty, ty_eval_ty},
     syntax::{self, AccessMode, AddressSpace, TranslationUnit},
 };
@@ -373,7 +373,7 @@ enum CliError {
     #[error("resource `@group({0}) @binding({1})` not found")]
     ResourceNotFound(u32, u32),
     #[error(
-        "resource `@group({0}) @binding({1})` ({2} bytes) incompatible with type `{3}` ({4} bytes)"
+        "resource `@group({0}) @binding({1})` ({2} bytes) is incompatible with type `{3}` ({4} bytes)"
     )]
     ResourceIncompatible(u32, u32, u32, wesl::eval::Type, u32),
     #[error("Could not convert instance to buffer (type `{0}` is not storable)")]
@@ -614,6 +614,8 @@ fn run(cli: Cli) -> Result<(), CliError> {
                 .map(|input| run_compile(&args.options, input))
                 .unwrap_or_else(|| Ok(CompileResult::default()))?;
 
+            let inputs = Inputs::new_zero_initialized();
+
             let resources = args
                 .resources
                 .iter()
@@ -628,7 +630,7 @@ fn run(cli: Cli) -> Result<(), CliError> {
                 })
                 .collect::<Result<_, _>>()?;
 
-            let mut exec = comp.exec(&args.entrypoint, resources, overrides)?;
+            let mut exec = comp.exec(&args.entrypoint, inputs, resources, overrides)?;
 
             if let Some(inst) = &exec.inst {
                 if args.binary {

crates/wesl-web/src/lib.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use tsify_next::Tsify;
 use wasm_bindgen::prelude::*;
 use wesl::{
-    CompileResult, Eval, VirtualResolver, Wesl,
+    CompileResult, Eval, Inputs, VirtualResolver, Wesl,
     eval::{EvalAttrs, HostShareable, Instance, RefInstance, Ty, ty_eval_ty},
     syntax::{self, AccessMode, AddressSpace, TranslationUnit},
 };
@@ -385,6 +385,8 @@ fn run_impl(args: Command) -> Result<RunResult, Error> {
                 run_compile(args.compile.clone()).map_err(|e| wesl_err_to_diagnostic(e, None))?;
 
             let resources = (|| -> Result<_, CliError> {
+                let inputs = Inputs::new_zero_initialized();
+
                 let resources = args
                     .resources
                     .iter()
@@ -399,7 +401,7 @@ fn run_impl(args: Command) -> Result<RunResult, Error> {
                     })
                     .collect::<Result<_, _>>()?;
 
-                let mut exec = comp.exec(&args.entrypoint, resources, overrides)?;
+                let mut exec = comp.exec(&args.entrypoint, inputs, resources, overrides)?;
 
                 let resources = args
                     .resources