alex/ash-molten
1
0
Fork 0
mirror of https://github.com/italicsjenga/ash-molten.git synced 2025-01-10 21:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Update to ash 0.30.0 (#15)

Browse source 
* Update to ash 0.30.0

* clippy

* Replace mk_version macro
This commit is contained in:
Maik Klein 2020-03-23 11:53:19 +01:00 committed by GitHub
parent 5b3e7f415b
commit e9a124d646
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -13,10 +13,10 @@ homepage = "https://github.com/EmbarkStudios/ash-molten"
documentation = "https://docs.rs/ash-molten" documentation = "https://docs.rs/ash-molten"
[dependencies] [dependencies]
ash = "0.29" ash = "0.30"
[features] [features]
external = [] external = []
[package.metadata.docs.rs] [package.metadata.docs.rs]
default-target = "x86_64-apple-darwin" default-target = "x86_64-apple-darwin"

5
build.rs
View file

@ -7,7 +7,7 @@ mod mac {
pub(crate) fn is_external_enabled() -> bool { pub(crate) fn is_external_enabled() -> bool {
std::env::vars() std::env::vars()
.filter_map(|(flag, _)| { .filter_map(|(flag, _)| {
const NAME: &'static str = "CARGO_FEATURE_"; const NAME: &str = "CARGO_FEATURE_";
if flag.starts_with(NAME) { if flag.starts_with(NAME) {
let feature = flag.split(NAME).nth(1).expect("").to_string(); let feature = flag.split(NAME).nth(1).expect("").to_string();
println!("{:?}", feature); println!("{:?}", feature);
@ -15,8 +15,7 @@ mod mac {
} }
None None
}) })
.find(|f| f == "EXTERNAL") .any(|f| f == "EXTERNAL")
.is_some()
} }
pub(crate) fn build_molten<P: AsRef<Path>>(target_dir: &P) -> &'static str { pub(crate) fn build_molten<P: AsRef<Path>>(target_dir: &P) -> &'static str {

4
src/bin/main.rs
View file

@ -1,6 +1,6 @@
use ash::{ use ash::{
version::{EntryV1_0, InstanceV1_0}, version::{EntryV1_0, InstanceV1_0},
vk, vk_make_version, vk,
}; };
use std::ffi::CString; use std::ffi::CString;
fn main() { fn main() {
@ -13,7 +13,7 @@ fn main() {
.application_version(0) .application_version(0)
.engine_name(&app_name) .engine_name(&app_name)
.engine_version(0) .engine_version(0)
.api_version(vk_make_version!(1, 0, 0)); .api_version(vk::make_version(1, 0, 0));
let create_info = vk::InstanceCreateInfo::builder().application_info(&appinfo); let create_info = vk::InstanceCreateInfo::builder().application_info(&appinfo);
let instance = entry.create_instance(&create_info, None).expect("Instance"); let instance = entry.create_instance(&create_info, None).expect("Instance");