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

Merge #173

Browse source 
173: Address validation error r=MaikKlein a=MaikKlein



Co-authored-by: Maik Klein <maikklein@googlemail.com>
This commit is contained in:
bors[bot] 2018-12-09 21:30:49 +00:00
parent 25df12f1ce 813e6a836e
commit a9b5b731c7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,7 +523,7 @@ fn main() {
}; };
let tex_descriptor = vk::DescriptorImageInfo { let tex_descriptor = vk::DescriptorImageInfo {
image_layout: vk::ImageLayout::GENERAL, image_layout: vk::ImageLayout::SHADER_READ_ONLY_OPTIMAL,
image_view: tex_image_view, image_view: tex_image_view,
sampler: sampler, sampler: sampler,
}; };

3
examples/src/lib.rs
View file

@ -40,7 +40,6 @@ use std::default::Default;
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::ops::Drop; use std::ops::Drop;
use std::os::raw::{c_char, c_void}; use std::os::raw::{c_char, c_void};
use std::ptr;
// Simple offset_of macro akin to C++ offsetof // Simple offset_of macro akin to C++ offsetof
#[macro_export] #[macro_export]
@ -127,6 +126,7 @@ unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
instance: &I, instance: &I,
window: &winit::Window, window: &winit::Window,
) -> Result<vk::SurfaceKHR, vk::Result> { ) -> Result<vk::SurfaceKHR, vk::Result> {
use std::ptr;
use winit::os::macos::WindowExt; use winit::os::macos::WindowExt;
let wnd: cocoa_id = mem::transmute(window.get_nswindow()); let wnd: cocoa_id = mem::transmute(window.get_nswindow());
@ -160,6 +160,7 @@ unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
instance: &I, instance: &I,
window: &winit::Window, window: &winit::Window,
) -> Result<vk::SurfaceKHR, vk::Result> { ) -> Result<vk::SurfaceKHR, vk::Result> {
use std::ptr;
use winapi::shared::windef::HWND; use winapi::shared::windef::HWND;
use winapi::um::libloaderapi::GetModuleHandleW; use winapi::um::libloaderapi::GetModuleHandleW;
use winit::os::windows::WindowExt; use winit::os::windows::WindowExt;