Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions naga-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ version = "0.19"
path = "../naga"
features = [
"compact",
"wgsl-in",
"wgsl-out",
"dot-out",
"glsl-in",
"glsl-out",
"spv-in",
"spv-out",
"msl-out",
"hlsl-out",
"dot-out",
"rust-out",
"spv-in",
"spv-out",
"wgsl-in",
"wgsl-out",
"serialize",
"deserialize",
]
17 changes: 17 additions & 0 deletions naga-cli/src/bin/naga.rs
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,23 @@ fn write_output(
.unwrap_pretty();
fs::write(output_path, wgsl)?;
}
"rs" => {
use naga::back::rust;

let rust = rust::write_string(
module,
info.as_ref().ok_or(CliError(
"Generating Rust output requires validation to \
succeed, and it failed in a previous step",
))?,
// TODO: expose target via CLI.
rust::Target::Gpu,
rust::WriterFlags::empty(),
)
.unwrap_pretty();

fs::write(output_path, rust)?;
}
other => {
println!("Unknown output extension: {other}");
}
Expand Down
5 changes: 5 additions & 0 deletions naga/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ msl-out = []
serialize = ["serde", "bitflags/serde", "indexmap/serde"]
deserialize = ["serde", "bitflags/serde", "indexmap/serde"]
arbitrary = ["dep:arbitrary", "bitflags/arbitrary", "indexmap/arbitrary"]
rust-out = ["clone", "syn", "prettyplease", "proc-macro2", "quote"]
spv-in = ["petgraph", "spirv"]
spv-out = ["spirv"]
wgsl-in = ["hexf-parse", "unicode-xid", "compact"]
Expand Down Expand Up @@ -60,6 +61,10 @@ petgraph = { version = "0.6", optional = true }
pp-rs = { version = "0.2.1", optional = true }
hexf-parse = { version = "0.2.1", optional = true }
unicode-xid = { version = "0.2.3", optional = true }
quote = { version = "1.0.35", optional = true }
proc-macro2 = { version = "1.0.71", optional = true }
syn = { version = "2.0.42", optional = true, features = ["full", "parsing"] }
prettyplease = { version = "0.2.15", optional = true }
arrayvec.workspace = true

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
Expand Down
2 changes: 2 additions & 0 deletions naga/src/back/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ pub mod glsl;
pub mod hlsl;
#[cfg(feature = "msl-out")]
pub mod msl;
#[cfg(feature = "rust-out")]
pub mod rust;
#[cfg(feature = "spv-out")]
pub mod spv;
#[cfg(feature = "wgsl-out")]
Expand Down
23 changes: 23 additions & 0 deletions naga/src/back/rust/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
use prettyplease;
pub mod writer;
pub use writer::{Writer, WriterError, WriterFlags};

#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
#[derive(Debug, Clone, Default)]
pub enum Target {
Cpu,
#[default]
Gpu,
}

pub fn write_string(
module: &crate::Module,
info: &crate::valid::ModuleInfo,
target: Target,
flags: WriterFlags,
) -> Result<String, WriterError> {
let mut w = Writer::new(target, flags);
let file = w.write_module(module, info)?;
Ok(prettyplease::unparse(&file))
}
Loading