github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

cli: Gather up SPIR-V output options settings.

Browse Source
This commit is contained in:
Jim Blandy
2023-09-12 14:10:30 -07:00
committed by Teodor Tanasoaia
parent 187aed8e11
commit 55a2ee445c
1 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
cli/src/bin/naga.rs
View File

@@ -161,8 +161,8 @@ struct Parameters<'a> {
entry_point: Option<String>,
keep_coordinate_space: bool,
spv_in: naga::front::spv::Options,
spv_out: naga::back::spv::Options<'a>,
dot: naga::back::dot::Options,
spv: naga::back::spv::Options<'a>,
msl: naga::back::msl::Options,
glsl: naga::back::glsl::Options,
hlsl: naga::back::hlsl::Options,
@@ -282,6 +282,12 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
params.dot.cfg_only = args.dot_cfg_only;
params.spv_out.bounds_check_policies = params.bounds_check_policies;
params.spv_out.flags.set(
naga::back::spv::WriterFlags::ADJUST_COORDINATE_SPACE,
!params.keep_coordinate_space,
);
let (module, input_text) = match Path::new(&input_path)
.extension()
.ok_or(CliError("Input filename has no extension"))?
@@ -345,6 +351,32 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
_ => return Err(CliError("Unknown input file extension").into()),
};
// Include debugging information if requested.
if args.generate_debug_symbols {
if let Some(ref input_text) = input_text {
params
.spv_out
.flags
.set(naga::back::spv::WriterFlags::DEBUG, true);
params.spv_out.debug_info = Some(naga::back::spv::DebugInfo {
source_code: input_text,
file_name: input_path
.file_name()
.and_then(std::ffi::OsStr::to_str)
.ok_or(CliError(
"input path for couldn't be converted to string \
for `--generate-debug-symbols",
))?,
})
} else {
eprintln!(
"warning: `--generate-debug-symbols` was passed, \
but input is not human-readable: {}",
input_path.display()
);
}
}
// Decide which capabilities our output formats can support.
let validation_caps =
output_paths
@@ -443,47 +475,13 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
None => None,
};
params.spv.bounds_check_policies = params.bounds_check_policies;
// Include debugging information if requested.
params.spv.debug_info = if args.generate_debug_symbols {
if let Some(ref input_text) = input_text {
params.spv.flags.set(spv::WriterFlags::DEBUG, true);
Some(spv::DebugInfo {
source_code: input_text,
file_name: input_path
.file_name()
.and_then(std::ffi::OsStr::to_str)
.ok_or(CliError(
"input path for couldn't be converted to string \
for `--generate-debug-symbols",
))?,
})
} else {
eprintln!(
"warning: `--generate-debug-symbols` was passed, \
but input is not human-readable: {}",
input_path.display()
);
None
}
} else {
None
};
params.spv.flags.set(
spv::WriterFlags::ADJUST_COORDINATE_SPACE,
!params.keep_coordinate_space,
);
let spv = spv::write_vec(
&module,
info.as_ref().ok_or(CliError(
"Generating SPIR-V output requires validation to \
succeed, and it failed in a previous step",
))?,
&params.spv,
&params.spv_out,
pipeline_options,
)
.unwrap_pretty();