From 8750a9ec2654dfe0526dfd047c61d120b9a80340 Mon Sep 17 00:00:00 2001 From: BearOso Date: Wed, 17 Apr 2024 17:12:51 -0500 Subject: [PATCH] Vulkan: Silence some warnings. --- qt/src/EmuMainWindow.cpp | 1 + vulkan/vk_mem_alloc_implementation.cpp | 2 ++ vulkan/vulkan_hpp_wrapper.hpp | 1 + 3 files changed, 4 insertions(+) diff --git a/qt/src/EmuMainWindow.cpp b/qt/src/EmuMainWindow.cpp index 13880788..9460f98c 100644 --- a/qt/src/EmuMainWindow.cpp +++ b/qt/src/EmuMainWindow.cpp @@ -660,6 +660,7 @@ void EmuMainWindow::pauseContinue() { manual_pause = true; app->pause(); + canvas->paintEvent(nullptr); } } diff --git a/vulkan/vk_mem_alloc_implementation.cpp b/vulkan/vk_mem_alloc_implementation.cpp index 5e5d1c47..1cb090d8 100644 --- a/vulkan/vk_mem_alloc_implementation.cpp +++ b/vulkan/vk_mem_alloc_implementation.cpp @@ -1,2 +1,4 @@ #define VMA_IMPLEMENTATION +#define VMA_NULLABLE +#define VMA_NOT_NULL #include "vulkan_context.hpp" \ No newline at end of file diff --git a/vulkan/vulkan_hpp_wrapper.hpp b/vulkan/vulkan_hpp_wrapper.hpp index d92a0aa6..345d6667 100644 --- a/vulkan/vulkan_hpp_wrapper.hpp +++ b/vulkan/vulkan_hpp_wrapper.hpp @@ -1,4 +1,5 @@ #ifndef NOMINMAX #define NOMINMAX #endif +#define VULKAN_HPP_ASSERT(x) #include "vulkan/vulkan.hpp"