alex/vello
1
0
Fork 0
mirror of https://github.com/italicsjenga/vello.git synced 2025-01-09 12:21:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Replace HashMap with sorted Vec so builds are deterministic

Browse source
This commit is contained in:
Chad Brokaw 2023-01-25 16:02:57 -05:00 committed by Arman Uguray
parent a5434569b6
commit a532eacf7b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vello_shaders/build.rs
View file

@ -13,7 +13,10 @@ use compile::ShaderInfo;
fn main() { fn main() {
let out_dir = env::var_os("OUT_DIR").unwrap(); let out_dir = env::var_os("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("shaders.rs"); let dest_path = Path::new(&out_dir).join("shaders.rs");
let shaders = compile::ShaderInfo::from_dir("../shader"); let mut shaders = compile::ShaderInfo::from_dir("../shader");
// Drop the HashMap and sort by name so that we get deterministic order.
let mut shaders = shaders.drain().collect::<Vec<_>>();
shaders.sort_by(|x, y| x.0.cmp(&y.0));
let mut buf = String::default(); let mut buf = String::default();
write_types(&mut buf, &shaders).unwrap(); write_types(&mut buf, &shaders).unwrap();
if cfg!(feature = "wgsl") { if cfg!(feature = "wgsl") {
@ -34,7 +37,7 @@ fn main() {
fn write_types( fn write_types(
buf: &mut String, buf: &mut String,
shaders: &HashMap<String, ShaderInfo>, shaders: &[(String, ShaderInfo)],
) -> Result<(), std::fmt::Error> { ) -> Result<(), std::fmt::Error> {
writeln!(buf, "pub struct Shaders<'a> {{")?; writeln!(buf, "pub struct Shaders<'a> {{")?;
for (name, _) in shaders { for (name, _) in shaders {
@ -64,7 +67,7 @@ fn write_types(
fn write_shaders( fn write_shaders(
buf: &mut String, buf: &mut String,
mod_name: &str, mod_name: &str,
shaders: &HashMap<String, ShaderInfo>, shaders: &[(String, ShaderInfo)],
translate: impl Fn(&ShaderInfo) -> Vec<u8>, translate: impl Fn(&ShaderInfo) -> Vec<u8>,
) -> Result<(), std::fmt::Error> { ) -> Result<(), std::fmt::Error> {
writeln!(buf, "pub mod {mod_name} {{")?; writeln!(buf, "pub mod {mod_name} {{")?;