integrated naga transpiling to wgsl

Author: Firestar99

Cargo.lock

@@ -28,6 +28,7 @@ tempdir = "0.3.7"
 test-log = "0.2.16"
 cargo_metadata = "0.19.2"
 semver = "1.0.26"
+naga = "25.0.1"
 
 # This crate MUST NEVER be upgraded, we need this particular "first" version to support old rust-gpu builds
 legacy_target_specs = { package = "rustc_codegen_spirv-target-specs", version = "0.9.0", features = ["include_str"] }

Cargo.toml

@@ -10,6 +10,10 @@ build = "build.rs"
 default-run = "cargo-gpu"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+# Enable naga support to convert spirv to wgsl
+naga = ["dep:naga"]
+
 [dependencies]
 cargo_metadata.workspace = true
 anyhow.workspace = true
@@ -24,6 +28,7 @@ serde.workspace = true
 serde_json.workspace = true
 crossterm.workspace = true
 semver.workspace = true
+naga = { workspace = true, optional = true, features = ["spv-in", "wgsl-out"] }
 
 [dev-dependencies]
 test-log.workspace = true

crates/cargo-gpu/Cargo.toml

@@ -65,11 +65,15 @@ mod legacy_target_specs;
 mod linkage;
 mod lockfile;
 mod metadata;
+#[cfg(feature = "naga")]
+mod naga;
 mod show;
 mod spirv_source;
 mod test;
 
 pub use install::*;
+#[cfg(feature = "naga")]
+pub use naga::*;
 pub use spirv_builder;
 
 /// Central function to write to the user.

crates/cargo-gpu/src/lib.rs

@@ -23,8 +23,13 @@ impl Linkage {
                 .map(|comp| comp.as_os_str().to_string_lossy())
                 .collect::<Vec<_>>()
                 .join("/"),
-            wgsl_entry_point: entry_point.as_ref().replace("::", ""),
+            wgsl_entry_point: spv_entry_point_to_wgsl(entry_point.as_ref()),
             entry_point: entry_point.as_ref().to_owned(),
         }
     }
 }
+
+/// Convert a spirv entry point to a valid wgsl entry point
+pub fn spv_entry_point_to_wgsl(entry_point: &str) -> String {
+    entry_point.replace("::", "")
+}