Skip to content

Commit

Permalink
Merge pull request #48 from filnet/silence_build
Browse files Browse the repository at this point in the history
Silence build
  • Loading branch information
gwihlidal authored Feb 14, 2021
2 parents 36c4bbd + e4ee902 commit ec27722
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ fn main() {
build.include("wrapper");
build.include("wrapper/vulkan");

// Disable VMA_ASSERT when rust assertions are disabled
#[cfg(not(debug_assertions))]
build.define("NDEBUG", "");

// We want to use the loader in ash, instead of requiring us to link
// in vulkan.dll/.dylib in addition to ash. This is especially important
// for MoltenVK, where there is no default installation path, unlike
Expand Down Expand Up @@ -93,6 +97,7 @@ fn main() {
.flag("-Wno-unused-parameter")
.flag("-Wno-unused-private-field")
.flag("-Wno-reorder")
.flag("-Wno-type-limits")
.cpp_link_stdlib("stdc++")
.cpp(true);
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ impl Default for AllocatorCreateInfo {
}
extern "C" fn get_instance_proc_addr(
_: ash::vk::Instance,
name: *const std::os::raw::c_char,
_: *const std::os::raw::c_char,
) -> *const std::os::raw::c_void {
get_device_proc_addr as *const _
}
Expand Down Expand Up @@ -768,7 +768,7 @@ pub struct DefragmentationStats {
impl Allocator {
/// Constructor a new `Allocator` using the provided options.
pub fn new(create_info: &AllocatorCreateInfo) -> Result<Self> {
use ash::version::{DeviceV1_0, DeviceV1_1, InstanceV1_0};
use ash::version::{DeviceV1_0, DeviceV1_1};
let instance = create_info.instance.clone();
let device = create_info.device.clone();
let routed_functions = unsafe {
Expand Down

0 comments on commit ec27722

Please sign in to comment.