mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 23:41:01 +01:00
[glsl-in] API revamp
The new api allows for reuse while keeping some allocations and to please the borrow checker in future work, it also splits the parser into logical modules to make it easier to work on.
This commit is contained in:
1 parent
0bd78ef85e
commit
a8a316da15
19 files changed
+3206
-2977
No files matched your search
+21
-43
@@ -221,50 +221,28 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
|
||||
}
|
||||
}
|
||||
}
|
||||
"vert" => {
|
||||
ext @ "vert" | ext @ "frag" | ext @ "comp" => {
|
||||
let input = fs::read_to_string(input_path)?;
|
||||
naga::front::glsl::parse_str(
|
||||
&input,
|
||||
&naga::front::glsl::Options {
|
||||
stage: naga::ShaderStage::Vertex,
|
||||
defines: Default::default(),
|
||||
},
|
||||
)
|
||||
.unwrap_or_else(|err| {
|
||||
let filename = input_path.file_name().and_then(std::ffi::OsStr::to_str);
|
||||
emit_glsl_parser_error(err, filename.unwrap_or("glsl"), &input);
|
||||
std::process::exit(1);
|
||||
})
|
||||
}
|
||||
"frag" => {
|
||||
let input = fs::read_to_string(input_path)?;
|
||||
naga::front::glsl::parse_str(
|
||||
&input,
|
||||
&naga::front::glsl::Options {
|
||||
stage: naga::ShaderStage::Fragment,
|
||||
defines: Default::default(),
|
||||
},
|
||||
)
|
||||
.unwrap_or_else(|err| {
|
||||
let filename = input_path.file_name().and_then(std::ffi::OsStr::to_str);
|
||||
emit_glsl_parser_error(err, filename.unwrap_or("glsl"), &input);
|
||||
std::process::exit(1);
|
||||
})
|
||||
}
|
||||
"comp" => {
|
||||
let input = fs::read_to_string(input_path)?;
|
||||
naga::front::glsl::parse_str(
|
||||
&input,
|
||||
&naga::front::glsl::Options {
|
||||
stage: naga::ShaderStage::Compute,
|
||||
defines: Default::default(),
|
||||
},
|
||||
)
|
||||
.unwrap_or_else(|err| {
|
||||
let filename = input_path.file_name().and_then(std::ffi::OsStr::to_str);
|
||||
emit_glsl_parser_error(err, filename.unwrap_or("glsl"), &input);
|
||||
std::process::exit(1);
|
||||
})
|
||||
let mut parser = naga::front::glsl::Parser::default();
|
||||
|
||||
parser
|
||||
.parse(
|
||||
&naga::front::glsl::Options {
|
||||
stage: match ext {
|
||||
"vert" => naga::ShaderStage::Vertex,
|
||||
"frag" => naga::ShaderStage::Fragment,
|
||||
"comp" => naga::ShaderStage::Compute,
|
||||
_ => unreachable!(),
|
||||
},
|
||||
defines: Default::default(),
|
||||
},
|
||||
&input,
|
||||
)
|
||||
.unwrap_or_else(|err| {
|
||||
let filename = input_path.file_name().and_then(std::ffi::OsStr::to_str);
|
||||
emit_glsl_parser_error(err, filename.unwrap_or("glsl"), &input);
|
||||
std::process::exit(1);
|
||||
})
|
||||
}
|
||||
_ => return Err(CliError("Unknown input file extension").into()),
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user