From 61ec5fda4031c19fda532bfb3bf070015e0d5f02 Mon Sep 17 00:00:00 2001 From: Viktor Zoutman Date: Tue, 31 Aug 2021 15:56:43 +0200 Subject: [PATCH] MoltenVK 1.1.5 (#61) * Update MoltenVK TO 1.1.5 * Update lints --- Cargo.toml | 2 +- build/build.rs | 29 +++++++++++++++++++++++------ build/xcframework/common.rs | 25 ++++++++++++------------- src/bin/main.rs | 25 +++++++++++++++++++++---- src/lib.rs | 25 +++++++++++++++++++++---- 5 files changed, 78 insertions(+), 28 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4995557..2a5e667 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ash-molten" description = "Statically linked MoltenVK for Vulkan on Mac using Ash" -version = "0.10.0+1.1.3-feb8d41" +version = "0.10.0+1.1.5" authors = ["Embark ", "Maik Klein "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/build/build.rs b/build/build.rs index d4b3c4d..413453a 100644 --- a/build/build.rs +++ b/build/build.rs @@ -1,27 +1,36 @@ -// BEGIN - Embark standard lints v0.3 +// BEGIN - Embark standard lints v0.4 // do not change or add/remove here, but one can add exceptions after this section // for more info see: #![deny(unsafe_code)] #![warn( clippy::all, clippy::await_holding_lock, + clippy::char_lit_as_u8, + clippy::checked_conversions, clippy::dbg_macro, clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::expl_impl_clone_on_copy, + clippy::explicit_deref_methods, clippy::explicit_into_iter_loop, + clippy::fallible_impl_from, clippy::filter_map_next, + clippy::float_cmp_const, clippy::fn_params_excessive_bools, clippy::if_let_mutex, + clippy::implicit_clone, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::invalid_upcast_comparisons, clippy::large_types_passed_by_value, clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::manual_ok_or, clippy::map_err_ignore, clippy::map_flatten, clippy::map_unwrap_or, @@ -30,26 +39,34 @@ clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, + clippy::mut_mut, + clippy::mutex_integer, clippy::needless_borrow, clippy::needless_continue, clippy::option_option, - clippy::pub_enum_variant_names, + clippy::path_buf_push_overwrite, + clippy::ptr_as_ptr, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::same_functions_in_if_condition, + clippy::semicolon_if_nothing_returned, clippy::string_add_assign, clippy::string_add, + clippy::string_lit_as_bytes, clippy::string_to_string, - clippy::suboptimal_flops, clippy::todo, + clippy::trait_duplication_in_bounds, clippy::unimplemented, clippy::unnested_or_patterns, clippy::unused_self, + clippy::useless_transmute, clippy::verbose_file_reads, + clippy::zero_sized_map_values, future_incompatible, nonstandard_style, rust_2018_idioms )] -// END - Embark standard lints v0.3 +// END - Embark standard lints v0.4 // crate-specific exceptions: #![allow(unsafe_code)] @@ -61,8 +78,8 @@ mod mac { use std::path::Path; // MoltenVK git tagged release to use - pub static MOLTEN_VK_VERSION: &str = "1.1.3"; - pub static MOLTEN_VK_PATCH: Option<&str> = Some("feb8d41"); + pub static MOLTEN_VK_VERSION: &str = "1.1.5"; + pub static MOLTEN_VK_PATCH: Option<&str> = None; // Return the artifact tag in the form of "x.x.x" or if there is a patch specified "x.x.x#yyyyyyy" pub(crate) fn get_artifact_tag() -> String { diff --git a/build/xcframework/common.rs b/build/xcframework/common.rs index 1f3d3e6..34b8036 100644 --- a/build/xcframework/common.rs +++ b/build/xcframework/common.rs @@ -13,11 +13,10 @@ pub enum Arch { #[serde(into = "&'static str")] #[serde(from = "String")] pub enum Platform { - MacOS, - #[allow(clippy::upper_case_acronyms)] - IOS, - TvOS, - WatchOS, + MacOs, + Ios, + TvOs, + WatchOs, Unknown, } @@ -56,10 +55,10 @@ impl<'a> From for &'a str { impl> From for Platform { fn from(platform: T) -> Self { match platform.as_ref() { - "tvos" => Platform::TvOS, - "macos" => Platform::MacOS, - "ios" => Platform::IOS, - "watchos" => Platform::WatchOS, + "tvos" => Platform::TvOs, + "macos" => Platform::MacOs, + "ios" => Platform::Ios, + "watchos" => Platform::WatchOs, _ => Platform::Unknown, } } @@ -68,10 +67,10 @@ impl> From for Platform { impl<'a> From for &'a str { fn from(platform: Platform) -> Self { match platform { - Platform::TvOS => "tvos", - Platform::MacOS => "macos", - Platform::IOS => "ios", - Platform::WatchOS => "watchos", + Platform::TvOs => "tvos", + Platform::MacOs => "macos", + Platform::Ios => "ios", + Platform::WatchOs => "watchos", Platform::Unknown => "", } } diff --git a/src/bin/main.rs b/src/bin/main.rs index d080c0a..72916bb 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -1,27 +1,36 @@ -// BEGIN - Embark standard lints v0.3 +// BEGIN - Embark standard lints v0.4 // do not change or add/remove here, but one can add exceptions after this section // for more info see: #![deny(unsafe_code)] #![warn( clippy::all, clippy::await_holding_lock, + clippy::char_lit_as_u8, + clippy::checked_conversions, clippy::dbg_macro, clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::expl_impl_clone_on_copy, + clippy::explicit_deref_methods, clippy::explicit_into_iter_loop, + clippy::fallible_impl_from, clippy::filter_map_next, + clippy::float_cmp_const, clippy::fn_params_excessive_bools, clippy::if_let_mutex, + clippy::implicit_clone, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::invalid_upcast_comparisons, clippy::large_types_passed_by_value, clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::manual_ok_or, clippy::map_err_ignore, clippy::map_flatten, clippy::map_unwrap_or, @@ -30,26 +39,34 @@ clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, + clippy::mut_mut, + clippy::mutex_integer, clippy::needless_borrow, clippy::needless_continue, clippy::option_option, - clippy::pub_enum_variant_names, + clippy::path_buf_push_overwrite, + clippy::ptr_as_ptr, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::same_functions_in_if_condition, + clippy::semicolon_if_nothing_returned, clippy::string_add_assign, clippy::string_add, + clippy::string_lit_as_bytes, clippy::string_to_string, - clippy::suboptimal_flops, clippy::todo, + clippy::trait_duplication_in_bounds, clippy::unimplemented, clippy::unnested_or_patterns, clippy::unused_self, + clippy::useless_transmute, clippy::verbose_file_reads, + clippy::zero_sized_map_values, future_incompatible, nonstandard_style, rust_2018_idioms )] -// END - Embark standard lints v0.3 +// END - Embark standard lints v0.4 // crate-specific exceptions: #![allow(unsafe_code)] diff --git a/src/lib.rs b/src/lib.rs index 4c0b964..eaf802b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,27 +1,36 @@ -// BEGIN - Embark standard lints v0.3 +// BEGIN - Embark standard lints v0.4 // do not change or add/remove here, but one can add exceptions after this section // for more info see: #![deny(unsafe_code)] #![warn( clippy::all, clippy::await_holding_lock, + clippy::char_lit_as_u8, + clippy::checked_conversions, clippy::dbg_macro, clippy::debug_assert_with_mut_call, clippy::doc_markdown, clippy::empty_enum, clippy::enum_glob_use, clippy::exit, + clippy::expl_impl_clone_on_copy, + clippy::explicit_deref_methods, clippy::explicit_into_iter_loop, + clippy::fallible_impl_from, clippy::filter_map_next, + clippy::float_cmp_const, clippy::fn_params_excessive_bools, clippy::if_let_mutex, + clippy::implicit_clone, clippy::imprecise_flops, clippy::inefficient_to_string, + clippy::invalid_upcast_comparisons, clippy::large_types_passed_by_value, clippy::let_unit_value, clippy::linkedlist, clippy::lossy_float_literal, clippy::macro_use_imports, + clippy::manual_ok_or, clippy::map_err_ignore, clippy::map_flatten, clippy::map_unwrap_or, @@ -30,26 +39,34 @@ clippy::match_wildcard_for_single_variants, clippy::mem_forget, clippy::mismatched_target_os, + clippy::mut_mut, + clippy::mutex_integer, clippy::needless_borrow, clippy::needless_continue, clippy::option_option, - clippy::pub_enum_variant_names, + clippy::path_buf_push_overwrite, + clippy::ptr_as_ptr, clippy::ref_option_ref, clippy::rest_pat_in_fully_bound_structs, + clippy::same_functions_in_if_condition, + clippy::semicolon_if_nothing_returned, clippy::string_add_assign, clippy::string_add, + clippy::string_lit_as_bytes, clippy::string_to_string, - clippy::suboptimal_flops, clippy::todo, + clippy::trait_duplication_in_bounds, clippy::unimplemented, clippy::unnested_or_patterns, clippy::unused_self, + clippy::useless_transmute, clippy::verbose_file_reads, + clippy::zero_sized_map_values, future_incompatible, nonstandard_style, rust_2018_idioms )] -// END - Embark standard lints v0.3 +// END - Embark standard lints v0.4 // crate-specific exceptions: #![allow(unsafe_code)]