buckn/tri
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgraded Ash and Vulkan versions

Browse Source
This commit is contained in:
Nathan Buck
2023-12-15 23:33:32 -05:00
parent 1d23169dcc
commit a6caf232d9
6 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utility/constants.rs
View File

@ -1,12 +1,12 @@
use crate::utility::debug::ValidationInfo;
use crate::utility::structures::DeviceExtension;
use ash::vk_make_version;
use ash::vk::make_api_version;
use std::os::raw::c_char;
pub const APPLICATION_VERSION: u32 = vk_make_version!(1, 0, 0);
pub const ENGINE_VERSION: u32 = vk_make_version!(1, 0, 0);
pub const API_VERSION: u32 = vk_make_version!(1, 0, 92);
pub const APPLICATION_VERSION: u32 = make_api_version(1, 0, 0, 0);
pub const ENGINE_VERSION: u32 = make_api_version(1, 0, 0, 0);
pub const API_VERSION: u32 = make_api_version(1, 3, 251, 0);
pub const WINDOW_WIDTH: u32 = 800;
pub const WINDOW_HEIGHT: u32 = 600;

2
src/utility/debug.rs
View File

@ -1,5 +1,5 @@
use ash::version::EntryV1_0;
use ash::vk;
use vk::*;
use std::ffi::CStr;
use std::os::raw::c_void;

21
src/utility/platforms.rs
View File

@ -1,5 +1,4 @@
use ash::version::{EntryV1_0, InstanceV1_0};
use ash::vk;
use ash::{vk, Entry, Instance};
#[cfg(target_os = "windows")]
use ash::extensions::khr::Win32Surface;
@ -51,9 +50,9 @@ pub fn required_extension_names() -> Vec<*const i8> {
// create surface ---------------------------------------------------------
#[cfg(all(unix, not(target_os = "android"), not(target_os = "macos")))]
pub unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
entry: &E,
instance: &I,
pub unsafe fn create_surface(
entry: &Entry,
instance: &Instance,
window: &winit::window::Window,
) -> Result<vk::SurfaceKHR, vk::Result> {
use std::ptr;
@ -73,9 +72,9 @@ pub unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
}
#[cfg(target_os = "macos")]
pub unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
entry: &E,
instance: &I,
pub unsafe fn create_surface(
entry: &Entry,
instance: &Instance,
window: &winit::window::Window,
) -> Result<vk::SurfaceKHR, vk::Result> {
use std::mem;
@ -109,9 +108,9 @@ pub unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
}
#[cfg(target_os = "windows")]
pub unsafe fn create_surface<E: EntryV1_0, I: InstanceV1_0>(
entry: &E,
instance: &I,
pub unsafe fn create_surface(
entry: &Entry,
instance: &Instance,
window: &winit::window::Window,
) -> Result<vk::SurfaceKHR, vk::Result> {
use std::os::raw::c_void;

7
src/utility/share.rs
View File

@ -206,7 +206,7 @@ pub mod v1 {
let color_blend_attachment_states = [vk::PipelineColorBlendAttachmentState {
blend_enable: vk::FALSE,
color_write_mask: vk::ColorComponentFlags::all(),
color_write_mask: vk::ColorComponentFlags::empty(),
src_color_blend_factor: vk::BlendFactor::ONE,
dst_color_blend_factor: vk::BlendFactor::ZERO,
color_blend_op: vk::BlendOp::ADD,
@ -1371,9 +1371,6 @@ pub mod v2 {
}
}
use ash::version::DeviceV1_0;
use ash::version::EntryV1_0;
use ash::version::InstanceV1_0;
use ash::vk;
use std::ffi::CString;
@ -1641,7 +1638,7 @@ pub fn find_queue_family(
physical_device,
index as u32,
surface_stuff.surface,
)
).unwrap()
};
if queue_family.queue_count > 0 && is_present_support {
queue_family_indices.present_family = Some(index);