From ee8154301addb8d5bcedd392e537aca3d68e353d Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Mon, 31 Jul 2023 23:08:26 +0200 Subject: [PATCH] early-access version 3784 --- README.md | 2 +- src/audio_core/common/audio_renderer_parameter.h | 6 +++--- src/video_core/CMakeLists.txt | 2 ++ src/video_core/vulkan_common/vma.cpp | 4 +--- src/video_core/vulkan_common/vma.h | 11 +++++++++++ src/video_core/vulkan_common/vulkan.h | 13 +++++++++++++ src/video_core/vulkan_common/vulkan_device.cpp | 3 +-- .../vulkan_common/vulkan_memory_allocator.cpp | 3 +-- src/video_core/vulkan_common/vulkan_wrapper.cpp | 4 +--- src/video_core/vulkan_common/vulkan_wrapper.h | 11 ++--------- 10 files changed, 36 insertions(+), 23 deletions(-) create mode 100755 src/video_core/vulkan_common/vma.h create mode 100755 src/video_core/vulkan_common/vulkan.h diff --git a/README.md b/README.md index f195ec56c..7ca7fb755 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3783. +This is the source code for early-access 3784. ## Legal Notice diff --git a/src/audio_core/common/audio_renderer_parameter.h b/src/audio_core/common/audio_renderer_parameter.h index 74a54d7eb..14ce7678b 100755 --- a/src/audio_core/common/audio_renderer_parameter.h +++ b/src/audio_core/common/audio_renderer_parameter.h @@ -32,16 +32,16 @@ struct AudioRendererParameterInternal { /* 0x14 */ u32 sinks; /* 0x18 */ u32 effects; /* 0x1C */ u32 perf_frames; - /* 0x20 */ u16 voice_drop_enabled; + /* 0x20 */ u8 voice_drop_enabled; + /* 0x21 */ u8 unk_21; /* 0x22 */ u8 rendering_device; /* 0x23 */ ExecutionMode execution_mode; /* 0x24 */ u32 splitter_infos; /* 0x28 */ s32 splitter_destinations; /* 0x2C */ u32 external_context_size; /* 0x30 */ u32 revision; - /* 0x34 */ char unk34[0x4]; }; -static_assert(sizeof(AudioRendererParameterInternal) == 0x38, +static_assert(sizeof(AudioRendererParameterInternal) == 0x34, "AudioRendererParameterInternal has the wrong size!"); /** diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index c52e7b428..ba2ccfae9 100755 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -275,6 +275,8 @@ add_library(video_core STATIC vulkan_common/nsight_aftermath_tracker.cpp vulkan_common/nsight_aftermath_tracker.h vulkan_common/vma.cpp + vulkan_common/vma.h + vulkan_common/vulkan.h ) create_target_directory_groups(video_core) diff --git a/src/video_core/vulkan_common/vma.cpp b/src/video_core/vulkan_common/vma.cpp index 1fe2cf52b..addf10762 100755 --- a/src/video_core/vulkan_common/vma.cpp +++ b/src/video_core/vulkan_common/vma.cpp @@ -2,7 +2,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later #define VMA_IMPLEMENTATION -#define VMA_STATIC_VULKAN_FUNCTIONS 0 -#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 -#include \ No newline at end of file +#include "video_core/vulkan_common/vma.h" diff --git a/src/video_core/vulkan_common/vma.h b/src/video_core/vulkan_common/vma.h new file mode 100755 index 000000000..6e25aa1bd --- /dev/null +++ b/src/video_core/vulkan_common/vma.h @@ -0,0 +1,11 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "video_core/vulkan_common/vulkan.h" + +#define VMA_STATIC_VULKAN_FUNCTIONS 0 +#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1 + +#include diff --git a/src/video_core/vulkan_common/vulkan.h b/src/video_core/vulkan_common/vulkan.h new file mode 100755 index 000000000..3fa963647 --- /dev/null +++ b/src/video_core/vulkan_common/vulkan.h @@ -0,0 +1,13 @@ +// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define VK_NO_PROTOTYPES +#ifdef _WIN32 +#define VK_USE_PLATFORM_WIN32_KHR +#elif defined(__APPLE__) +#define VK_USE_PLATFORM_METAL_EXT +#endif + +#include diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 116e13149..c6eeb2b08 100755 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -15,6 +15,7 @@ #include "common/polyfill_ranges.h" #include "common/settings.h" #include "video_core/vulkan_common/nsight_aftermath_tracker.h" +#include "video_core/vulkan_common/vma.h" #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_wrapper.h" @@ -22,8 +23,6 @@ #include #endif -#include - namespace Vulkan { using namespace Common::Literals; namespace { diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp index 6ac38e645..59849a85f 100755 --- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp +++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp @@ -11,12 +11,11 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "common/polyfill_ranges.h" +#include "video_core/vulkan_common/vma.h" #include "video_core/vulkan_common/vulkan_device.h" #include "video_core/vulkan_common/vulkan_memory_allocator.h" #include "video_core/vulkan_common/vulkan_wrapper.h" -#include - namespace Vulkan { namespace { struct Range { diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index bed0b136e..ba6a51af6 100755 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -9,11 +9,9 @@ #include "common/common_types.h" #include "common/logging/log.h" - +#include "video_core/vulkan_common/vma.h" #include "video_core/vulkan_common/vulkan_wrapper.h" -#include - namespace Vulkan::vk { namespace { diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index 825008406..b6540dc07 100755 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h @@ -12,13 +12,8 @@ #include #include -#define VK_NO_PROTOTYPES -#ifdef _WIN32 -#define VK_USE_PLATFORM_WIN32_KHR -#elif defined(__APPLE__) -#define VK_USE_PLATFORM_METAL_EXT -#endif -#include +#include "common/common_types.h" +#include "video_core/vulkan_common/vulkan.h" // Sanitize macros #ifdef CreateEvent @@ -28,8 +23,6 @@ #undef CreateSemaphore #endif -#include "common/common_types.h" - #ifdef _MSC_VER #pragma warning(disable : 26812) // Disable prefer enum class over enum #endif