early-access version 3784

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
 

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!");
 
 /**

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)

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 <vk_mem_alloc.h>
+#include "video_core/vulkan_common/vma.h"

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 <vk_mem_alloc.h>

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 <vulkan/vulkan.h>

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 <adrenotools/bcenabler.h>
 #endif
 
-#include <vk_mem_alloc.h>
-
 namespace Vulkan {
 using namespace Common::Literals;
 namespace {

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 <vk_mem_alloc.h>
-
 namespace Vulkan {
 namespace {
 struct Range {

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 <vk_mem_alloc.h>
-
 namespace Vulkan::vk {
 
 namespace {

src/video_core/vulkan_common/vulkan_wrapper.h

@@ -12,13 +12,8 @@
 #include <utility>
 #include <vector>
 
-#define VK_NO_PROTOTYPES
+#include "common/common_types.h"
-#ifdef _WIN32
+#include "video_core/vulkan_common/vulkan.h"
-#define VK_USE_PLATFORM_WIN32_KHR
-#elif defined(__APPLE__)
-#define VK_USE_PLATFORM_METAL_EXT
-#endif
-#include <vulkan/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