Android #23

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 */ u8 voice_drop_enabled;
-    /* 0x21 */ u8 unk_21;
+    /* 0x20 */ u16 voice_drop_enabled;
     /* 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) == 0x34,
+static_assert(sizeof(AudioRendererParameterInternal) == 0x38,
               "AudioRendererParameterInternal has the wrong size!");
 
 /**

src/common/wall_clock.cpp

@@ -56,12 +56,12 @@ std::unique_ptr<WallClock> CreateOptimalClock() {
 #ifdef ARCHITECTURE_x86_64
     const auto& caps = GetCPUCaps();
 
-    if (caps.invariant_tsc && caps.tsc_frequency >= std::nano::den) {
+    if (caps.invariant_tsc && caps.tsc_frequency >= WallClock::GPUTickFreq) {
         return std::make_unique<X64::NativeClock>(caps.tsc_frequency);
     } else {
         // Fallback to StandardWallClock if the hardware TSC
         // - Is not invariant
-        // - Is not more precise than 1 GHz (1ns resolution)
+        // - Is not more precise than GPUTickFreq
         return std::make_unique<StandardWallClock>();
     }
 #else

src/core/hle/service/time/time_zone_content_manager.cpp

@@ -3,7 +3,6 @@
 
 #include <chrono>
 #include <sstream>
-#include <utility>
 
 #include "common/logging/log.h"
 #include "common/settings.h"
@@ -47,14 +46,14 @@ static FileSys::VirtualDir GetTimeZoneBinary(Core::System& system) {
     return FileSys::ExtractRomFS(romfs);
 }
 
-static std::vector<std::string> BuildLocationNameCache(
-    const FileSys::VirtualDir& time_zone_binary) {
-    if (!time_zone_binary) {
+static std::vector<std::string> BuildLocationNameCache(Core::System& system) {
+    const FileSys::VirtualDir extracted_romfs{GetTimeZoneBinary(system)};
+    if (!extracted_romfs) {
         LOG_ERROR(Service_Time, "Failed to extract RomFS for {:016X}!", time_zone_binary_titleid);
         return {};
     }
 
-    const FileSys::VirtualFile binary_list{time_zone_binary->GetFile("binaryList.txt")};
+    const FileSys::VirtualFile binary_list{extracted_romfs->GetFile("binaryList.txt")};
     if (!binary_list) {
         LOG_ERROR(Service_Time, "{:016X} has no file binaryList.txt!", time_zone_binary_titleid);
         return {};
@@ -74,8 +73,7 @@ static std::vector<std::string> BuildLocationNameCache(
 }
 
 TimeZoneContentManager::TimeZoneContentManager(Core::System& system_)
-    : system{system_}, time_zone_binary{GetTimeZoneBinary(system)},
-      location_name_cache{BuildLocationNameCache(time_zone_binary)} {}
+    : system{system_}, location_name_cache{BuildLocationNameCache(system)} {}
 
 void TimeZoneContentManager::Initialize(TimeManager& time_manager) {
     const auto timezone_setting = Settings::GetTimeZoneString();
@@ -113,12 +111,13 @@ Result TimeZoneContentManager::GetTimeZoneInfoFile(const std::string& location_n
         return ERROR_TIME_NOT_FOUND;
     }
 
-    if (!time_zone_binary) {
+    const FileSys::VirtualDir extracted_romfs{GetTimeZoneBinary(system)};
+    if (!extracted_romfs) {
         LOG_ERROR(Service_Time, "Failed to extract RomFS for {:016X}!", time_zone_binary_titleid);
         return ERROR_TIME_NOT_FOUND;
     }
 
-    const FileSys::VirtualDir zoneinfo_dir{time_zone_binary->GetSubdirectory("zoneinfo")};
+    const FileSys::VirtualDir zoneinfo_dir{extracted_romfs->GetSubdirectory("zoneinfo")};
     if (!zoneinfo_dir) {
         LOG_ERROR(Service_Time, "{:016X} has no directory zoneinfo!", time_zone_binary_titleid);
         return ERROR_TIME_NOT_FOUND;

src/core/hle/service/time/time_zone_content_manager.h

@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 
-#include "core/file_sys/vfs_types.h"
 #include "core/hle/service/time/time_zone_manager.h"
 
 namespace Core {
@@ -42,7 +41,6 @@ private:
 
     Core::System& system;
     TimeZoneManager time_zone_manager;
-    const FileSys::VirtualDir time_zone_binary;
     const std::vector<std::string> location_name_cache;
 };
 

src/video_core/CMakeLists.txt

@@ -275,8 +275,6 @@ 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/renderer_vulkan/vk_blit_screen.cpp

@@ -566,7 +566,7 @@ void BlitScreen::CreateDescriptorPool() {
     const VkDescriptorPoolCreateInfo ci{
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = nullptr,
-        .flags = 0,
+        .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
         .maxSets = static_cast<u32>(image_count),
         .poolSizeCount = static_cast<u32>(pool_sizes.size()),
         .pPoolSizes = pool_sizes.data(),
@@ -576,7 +576,7 @@ void BlitScreen::CreateDescriptorPool() {
     const VkDescriptorPoolCreateInfo ci_aa{
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = nullptr,
-        .flags = 0,
+        .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
         .maxSets = static_cast<u32>(image_count),
         .poolSizeCount = static_cast<u32>(pool_sizes_aa.size()),
         .pPoolSizes = pool_sizes_aa.data(),

src/video_core/renderer_vulkan/vk_descriptor_pool.cpp

@@ -77,7 +77,7 @@ static void AllocatePool(const Device& device, DescriptorBank& bank) {
     bank.pools.push_back(device.GetLogical().CreateDescriptorPool({
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = nullptr,
-        .flags = 0,
+        .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
         .maxSets = sets_per_pool,
         .poolSizeCount = static_cast<u32>(pool_cursor),
         .pPoolSizes = std::data(pool_sizes),

src/video_core/renderer_vulkan/vk_fsr.cpp

@@ -150,7 +150,7 @@ void FSR::CreateDescriptorPool() {
     const VkDescriptorPoolCreateInfo ci{
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = nullptr,
-        .flags = 0,
+        .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
         .maxSets = static_cast<u32>(image_count * 2),
         .poolSizeCount = static_cast<u32>(pool_sizes.size()),
         .pPoolSizes = pool_sizes.data(),

src/video_core/renderer_vulkan/vk_turbo_mode.cpp

@@ -62,7 +62,7 @@ void TurboMode::Run(std::stop_token stop_token) {
     auto descriptor_pool = dld.CreateDescriptorPool(VkDescriptorPoolCreateInfo{
         .sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO,
         .pNext = nullptr,
-        .flags = 0,
+        .flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT,
         .maxSets = 1,
         .poolSizeCount = 1,
         .pPoolSizes = &pool_size,

src/video_core/vulkan_common/vma.cpp

@@ -2,5 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #define VMA_IMPLEMENTATION
+#define VMA_STATIC_VULKAN_FUNCTIONS 0
+#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
 
-#include "video_core/vulkan_common/vma.h"
+#include <vk_mem_alloc.h>

src/video_core/vulkan_common/vma.h

@@ -1,11 +0,0 @@
-// 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

@@ -1,13 +0,0 @@
-// 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,7 +15,6 @@
 #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"
 
@@ -23,6 +22,8 @@
 #include <adrenotools/bcenabler.h>
 #endif
 
+#include <vk_mem_alloc.h>
+
 namespace Vulkan {
 using namespace Common::Literals;
 namespace {
@@ -553,14 +554,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
     }
 
     sets_per_pool = 64;
-    if (extensions.extended_dynamic_state3 && is_amd_driver &&
-        !features.shader_float16_int8.shaderFloat16 &&
-        properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 258)) {
-        LOG_WARNING(Render_Vulkan, "AMD GCN4 has broken extendedDynamicState3ColorBlendEquation");
-        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false;
-        features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false;
-        dynamic_state3_blending = false;
-    }
     if (is_amd_driver) {
         // AMD drivers need a higher amount of Sets per Pool in certain circumstances like in XC2.
         sets_per_pool = 96;

src/video_core/vulkan_common/vulkan_memory_allocator.cpp

@@ -11,11 +11,12 @@
 #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,9 +9,11 @@
 
 #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,8 +12,13 @@
 #include <utility>
 #include <vector>
 
-#include "common/common_types.h"
-#include "video_core/vulkan_common/vulkan.h"
+#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>
 
 // Sanitize macros
 #ifdef CreateEvent
@@ -23,6 +28,8 @@
 #undef CreateSemaphore
 #endif
 
+#include "common/common_types.h"
+
 #ifdef _MSC_VER
 #pragma warning(disable : 26812) // Disable prefer enum class over enum
 #endif