nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-22 06:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix example-runner-ash (#693)

Browse Source 
* Fix example-runner-ash

Fix compile_shaders() to return correct shader name.

* Refactor example-runner-ash

- Stop to get shader name from path. It was too complicated.
This commit is contained in:
hatoo 2021-08-03 17:03:36 +09:00 committed by GitHub
parent d77cc6d360
commit 710e6ab4d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/runners/ash/src/main.rs
View File

@ -89,7 +89,6 @@ use std::{
ffi::{CStr, CString},
fs::File,
ops::Drop,
path::PathBuf,
sync::mpsc::{sync_channel, TryRecvError, TrySendError},
thread,
};
@ -199,24 +198,19 @@ pub fn main() {
}
pub fn compile_shaders() -> Vec<SpvFile> {
let spv_paths: Vec<PathBuf> =
vec![
SpirvBuilder::new("examples/shaders/sky-shader", "spirv-unknown-vulkan1.1")
.print_metadata(MetadataPrintout::None)
.build()
.unwrap()
.module
.unwrap_single()
.to_path_buf(),
];
let mut spv_files = Vec::<SpvFile>::with_capacity(spv_paths.len());
for path in spv_paths.iter() {
spv_files.push(SpvFile {
name: path.file_stem().unwrap().to_str().unwrap().to_owned(),
data: read_spv(&mut File::open(path).unwrap()).unwrap(),
});
}
spv_files
let sky_shader_path =
SpirvBuilder::new("examples/shaders/sky-shader", "spirv-unknown-vulkan1.1")
.print_metadata(MetadataPrintout::None)
.build()
.unwrap()
.module
.unwrap_single()
.to_path_buf();
let sky_shader = SpvFile {
name: "sky_shader".to_string(),
data: read_spv(&mut File::open(sky_shader_path).unwrap()).unwrap(),
};
vec![sky_shader]
}
#[derive(Debug)]