alex/ash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #220

Browse source 
220: Aloucks fix example asset loading r=MaikKlein a=MaikKlein

Closes #219 

Co-authored-by: Aaron Loucks <aloucks@cofront.net>
Co-authored-by: maik <maik.klein@embark-studios.com>
This commit is contained in:
bors[bot] 2019-06-23 10:39:06 +00:00
commit 9838cf9566
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
examples/src/bin/texture.rs
View file

@ -1,9 +1,8 @@
use std::default::Default;
use std::ffi::CString;
use std::fs::File;
use std::io::Cursor;
use std::mem::{self, align_of};
use std::os::raw::c_void;
use std::path::Path;
use ash::util::*;
use ash::vk;
@ -263,7 +262,9 @@ fn main() {
.bind_buffer_memory(uniform_color_buffer, uniform_color_buffer_memory, 0)
.unwrap();
let image = image::open("assets/rust.png").unwrap().to_rgba();
let image = image::load_from_memory(include_bytes!("../../assets/rust.png"))
.unwrap()
.to_rgba();
let image_dimensions = image.dimensions();
let image_data = image.into_raw();
let image_buffer_info = vk::BufferCreateInfo {
@ -543,10 +544,8 @@ fn main() {
];
base.device.update_descriptor_sets(&write_desc_sets, &[]);
let mut vertex_spv_file =
File::open(Path::new("shader/texture/vert.spv")).expect("Could not find vert.spv.");
let mut frag_spv_file =
File::open(Path::new("shader/texture/frag.spv")).expect("Could not find frag.spv.");
let mut vertex_spv_file = Cursor::new(&include_bytes!("../../shader/texture/vert.spv")[..]);
let mut frag_spv_file = Cursor::new(&include_bytes!("../../shader/texture/frag.spv")[..]);
let vertex_code =
read_spv(&mut vertex_spv_file).expect("Failed to read vertex shader spv file");

8
examples/src/bin/triangle.rs
View file

@ -3,10 +3,9 @@ use ash::vk;
use examples::*;
use std::default::Default;
use std::ffi::CString;
use std::fs::File;
use std::io::Cursor;
use std::mem;
use std::mem::align_of;
use std::path::Path;
#[derive(Clone, Debug, Copy)]
struct Vertex {
@ -200,9 +199,8 @@ fn main() {
.bind_buffer_memory(vertex_input_buffer, vertex_input_buffer_memory, 0)
.unwrap();
let mut vertex_spv_file =
File::open(Path::new("shader/triangle/vert.spv")).expect("Could not find vert.spv.");
let mut frag_spv_file =
File::open(Path::new("shader/triangle/frag.spv")).expect("Could not find frag.spv.");
Cursor::new(&include_bytes!("../../shader/triangle/vert.spv")[..]);
let mut frag_spv_file = Cursor::new(&include_bytes!("../../shader/triangle/frag.spv")[..]);
let vertex_code =
read_spv(&mut vertex_spv_file).expect("Failed to read vertex shader spv file");