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

MoltenVK 1.1.5 (#61)

Browse source 
* Update MoltenVK TO 1.1.5

* Update lints
This commit is contained in:
Viktor Zoutman 2021-08-31 15:56:43 +02:00 committed by GitHub
parent 98697e2620
commit 61ec5fda40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 78 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "ash-molten" name = "ash-molten"
description = "Statically linked MoltenVK for Vulkan on Mac using Ash" 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 <opensource@embark-studios.com>", "Maik Klein <maik.klein@embark-studios.com>"] authors = ["Embark <opensource@embark-studios.com>", "Maik Klein <maik.klein@embark-studios.com>"]
edition = "2018" edition = "2018"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"

29
build/build.rs
View file

@ -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 // do not change or add/remove here, but one can add exceptions after this section
// for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59> // for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![warn( #![warn(
clippy::all, clippy::all,
clippy::await_holding_lock, clippy::await_holding_lock,
clippy::char_lit_as_u8,
clippy::checked_conversions,
clippy::dbg_macro, clippy::dbg_macro,
clippy::debug_assert_with_mut_call, clippy::debug_assert_with_mut_call,
clippy::doc_markdown, clippy::doc_markdown,
clippy::empty_enum, clippy::empty_enum,
clippy::enum_glob_use, clippy::enum_glob_use,
clippy::exit, clippy::exit,
clippy::expl_impl_clone_on_copy,
clippy::explicit_deref_methods,
clippy::explicit_into_iter_loop, clippy::explicit_into_iter_loop,
clippy::fallible_impl_from,
clippy::filter_map_next, clippy::filter_map_next,
clippy::float_cmp_const,
clippy::fn_params_excessive_bools, clippy::fn_params_excessive_bools,
clippy::if_let_mutex, clippy::if_let_mutex,
clippy::implicit_clone,
clippy::imprecise_flops, clippy::imprecise_flops,
clippy::inefficient_to_string, clippy::inefficient_to_string,
clippy::invalid_upcast_comparisons,
clippy::large_types_passed_by_value, clippy::large_types_passed_by_value,
clippy::let_unit_value, clippy::let_unit_value,
clippy::linkedlist, clippy::linkedlist,
clippy::lossy_float_literal, clippy::lossy_float_literal,
clippy::macro_use_imports, clippy::macro_use_imports,
clippy::manual_ok_or,
clippy::map_err_ignore, clippy::map_err_ignore,
clippy::map_flatten, clippy::map_flatten,
clippy::map_unwrap_or, clippy::map_unwrap_or,
@ -30,26 +39,34 @@
clippy::match_wildcard_for_single_variants, clippy::match_wildcard_for_single_variants,
clippy::mem_forget, clippy::mem_forget,
clippy::mismatched_target_os, clippy::mismatched_target_os,
clippy::mut_mut,
clippy::mutex_integer,
clippy::needless_borrow, clippy::needless_borrow,
clippy::needless_continue, clippy::needless_continue,
clippy::option_option, clippy::option_option,
clippy::pub_enum_variant_names, clippy::path_buf_push_overwrite,
clippy::ptr_as_ptr,
clippy::ref_option_ref, clippy::ref_option_ref,
clippy::rest_pat_in_fully_bound_structs, 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_assign,
clippy::string_add, clippy::string_add,
clippy::string_lit_as_bytes,
clippy::string_to_string, clippy::string_to_string,
clippy::suboptimal_flops,
clippy::todo, clippy::todo,
clippy::trait_duplication_in_bounds,
clippy::unimplemented, clippy::unimplemented,
clippy::unnested_or_patterns, clippy::unnested_or_patterns,
clippy::unused_self, clippy::unused_self,
clippy::useless_transmute,
clippy::verbose_file_reads, clippy::verbose_file_reads,
clippy::zero_sized_map_values,
future_incompatible, future_incompatible,
nonstandard_style, nonstandard_style,
rust_2018_idioms rust_2018_idioms
)] )]
// END - Embark standard lints v0.3 // END - Embark standard lints v0.4
// crate-specific exceptions: // crate-specific exceptions:
#![allow(unsafe_code)] #![allow(unsafe_code)]
@ -61,8 +78,8 @@ mod mac {
use std::path::Path; use std::path::Path;
// MoltenVK git tagged release to use // MoltenVK git tagged release to use
pub static MOLTEN_VK_VERSION: &str = "1.1.3"; pub static MOLTEN_VK_VERSION: &str = "1.1.5";
pub static MOLTEN_VK_PATCH: Option<&str> = Some("feb8d41"); 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" // 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 { pub(crate) fn get_artifact_tag() -> String {

25
build/xcframework/common.rs
View file

@ -13,11 +13,10 @@ pub enum Arch {
#[serde(into = "&'static str")] #[serde(into = "&'static str")]
#[serde(from = "String")] #[serde(from = "String")]
pub enum Platform { pub enum Platform {
MacOS, MacOs,
#[allow(clippy::upper_case_acronyms)] Ios,
IOS, TvOs,
TvOS, WatchOs,
WatchOS,
Unknown, Unknown,
} }
@ -56,10 +55,10 @@ impl<'a> From<Arch> for &'a str {
impl<T: AsRef<str>> From<T> for Platform { impl<T: AsRef<str>> From<T> for Platform {
fn from(platform: T) -> Self { fn from(platform: T) -> Self {
match platform.as_ref() { match platform.as_ref() {
"tvos" => Platform::TvOS, "tvos" => Platform::TvOs,
"macos" => Platform::MacOS, "macos" => Platform::MacOs,
"ios" => Platform::IOS, "ios" => Platform::Ios,
"watchos" => Platform::WatchOS, "watchos" => Platform::WatchOs,
_ => Platform::Unknown, _ => Platform::Unknown,
} }
} }
@ -68,10 +67,10 @@ impl<T: AsRef<str>> From<T> for Platform {
impl<'a> From<Platform> for &'a str { impl<'a> From<Platform> for &'a str {
fn from(platform: Platform) -> Self { fn from(platform: Platform) -> Self {
match platform { match platform {
Platform::TvOS => "tvos", Platform::TvOs => "tvos",
Platform::MacOS => "macos", Platform::MacOs => "macos",
Platform::IOS => "ios", Platform::Ios => "ios",
Platform::WatchOS => "watchos", Platform::WatchOs => "watchos",
Platform::Unknown => "", Platform::Unknown => "",
} }
} }

25
src/bin/main.rs
View file

@ -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 // do not change or add/remove here, but one can add exceptions after this section
// for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59> // for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![warn( #![warn(
clippy::all, clippy::all,
clippy::await_holding_lock, clippy::await_holding_lock,
clippy::char_lit_as_u8,
clippy::checked_conversions,
clippy::dbg_macro, clippy::dbg_macro,
clippy::debug_assert_with_mut_call, clippy::debug_assert_with_mut_call,
clippy::doc_markdown, clippy::doc_markdown,
clippy::empty_enum, clippy::empty_enum,
clippy::enum_glob_use, clippy::enum_glob_use,
clippy::exit, clippy::exit,
clippy::expl_impl_clone_on_copy,
clippy::explicit_deref_methods,
clippy::explicit_into_iter_loop, clippy::explicit_into_iter_loop,
clippy::fallible_impl_from,
clippy::filter_map_next, clippy::filter_map_next,
clippy::float_cmp_const,
clippy::fn_params_excessive_bools, clippy::fn_params_excessive_bools,
clippy::if_let_mutex, clippy::if_let_mutex,
clippy::implicit_clone,
clippy::imprecise_flops, clippy::imprecise_flops,
clippy::inefficient_to_string, clippy::inefficient_to_string,
clippy::invalid_upcast_comparisons,
clippy::large_types_passed_by_value, clippy::large_types_passed_by_value,
clippy::let_unit_value, clippy::let_unit_value,
clippy::linkedlist, clippy::linkedlist,
clippy::lossy_float_literal, clippy::lossy_float_literal,
clippy::macro_use_imports, clippy::macro_use_imports,
clippy::manual_ok_or,
clippy::map_err_ignore, clippy::map_err_ignore,
clippy::map_flatten, clippy::map_flatten,
clippy::map_unwrap_or, clippy::map_unwrap_or,
@ -30,26 +39,34 @@
clippy::match_wildcard_for_single_variants, clippy::match_wildcard_for_single_variants,
clippy::mem_forget, clippy::mem_forget,
clippy::mismatched_target_os, clippy::mismatched_target_os,
clippy::mut_mut,
clippy::mutex_integer,
clippy::needless_borrow, clippy::needless_borrow,
clippy::needless_continue, clippy::needless_continue,
clippy::option_option, clippy::option_option,
clippy::pub_enum_variant_names, clippy::path_buf_push_overwrite,
clippy::ptr_as_ptr,
clippy::ref_option_ref, clippy::ref_option_ref,
clippy::rest_pat_in_fully_bound_structs, 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_assign,
clippy::string_add, clippy::string_add,
clippy::string_lit_as_bytes,
clippy::string_to_string, clippy::string_to_string,
clippy::suboptimal_flops,
clippy::todo, clippy::todo,
clippy::trait_duplication_in_bounds,
clippy::unimplemented, clippy::unimplemented,
clippy::unnested_or_patterns, clippy::unnested_or_patterns,
clippy::unused_self, clippy::unused_self,
clippy::useless_transmute,
clippy::verbose_file_reads, clippy::verbose_file_reads,
clippy::zero_sized_map_values,
future_incompatible, future_incompatible,
nonstandard_style, nonstandard_style,
rust_2018_idioms rust_2018_idioms
)] )]
// END - Embark standard lints v0.3 // END - Embark standard lints v0.4
// crate-specific exceptions: // crate-specific exceptions:
#![allow(unsafe_code)] #![allow(unsafe_code)]

25
src/lib.rs
View file

@ -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 // do not change or add/remove here, but one can add exceptions after this section
// for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59> // for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![warn( #![warn(
clippy::all, clippy::all,
clippy::await_holding_lock, clippy::await_holding_lock,
clippy::char_lit_as_u8,
clippy::checked_conversions,
clippy::dbg_macro, clippy::dbg_macro,
clippy::debug_assert_with_mut_call, clippy::debug_assert_with_mut_call,
clippy::doc_markdown, clippy::doc_markdown,
clippy::empty_enum, clippy::empty_enum,
clippy::enum_glob_use, clippy::enum_glob_use,
clippy::exit, clippy::exit,
clippy::expl_impl_clone_on_copy,
clippy::explicit_deref_methods,
clippy::explicit_into_iter_loop, clippy::explicit_into_iter_loop,
clippy::fallible_impl_from,
clippy::filter_map_next, clippy::filter_map_next,
clippy::float_cmp_const,
clippy::fn_params_excessive_bools, clippy::fn_params_excessive_bools,
clippy::if_let_mutex, clippy::if_let_mutex,
clippy::implicit_clone,
clippy::imprecise_flops, clippy::imprecise_flops,
clippy::inefficient_to_string, clippy::inefficient_to_string,
clippy::invalid_upcast_comparisons,
clippy::large_types_passed_by_value, clippy::large_types_passed_by_value,
clippy::let_unit_value, clippy::let_unit_value,
clippy::linkedlist, clippy::linkedlist,
clippy::lossy_float_literal, clippy::lossy_float_literal,
clippy::macro_use_imports, clippy::macro_use_imports,
clippy::manual_ok_or,
clippy::map_err_ignore, clippy::map_err_ignore,
clippy::map_flatten, clippy::map_flatten,
clippy::map_unwrap_or, clippy::map_unwrap_or,
@ -30,26 +39,34 @@
clippy::match_wildcard_for_single_variants, clippy::match_wildcard_for_single_variants,
clippy::mem_forget, clippy::mem_forget,
clippy::mismatched_target_os, clippy::mismatched_target_os,
clippy::mut_mut,
clippy::mutex_integer,
clippy::needless_borrow, clippy::needless_borrow,
clippy::needless_continue, clippy::needless_continue,
clippy::option_option, clippy::option_option,
clippy::pub_enum_variant_names, clippy::path_buf_push_overwrite,
clippy::ptr_as_ptr,
clippy::ref_option_ref, clippy::ref_option_ref,
clippy::rest_pat_in_fully_bound_structs, 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_assign,
clippy::string_add, clippy::string_add,
clippy::string_lit_as_bytes,
clippy::string_to_string, clippy::string_to_string,
clippy::suboptimal_flops,
clippy::todo, clippy::todo,
clippy::trait_duplication_in_bounds,
clippy::unimplemented, clippy::unimplemented,
clippy::unnested_or_patterns, clippy::unnested_or_patterns,
clippy::unused_self, clippy::unused_self,
clippy::useless_transmute,
clippy::verbose_file_reads, clippy::verbose_file_reads,
clippy::zero_sized_map_values,
future_incompatible, future_incompatible,
nonstandard_style, nonstandard_style,
rust_2018_idioms rust_2018_idioms
)] )]
// END - Embark standard lints v0.3 // END - Embark standard lints v0.4
// crate-specific exceptions: // crate-specific exceptions:
#![allow(unsafe_code)] #![allow(unsafe_code)]