VERY experimental Nintendo Switch 2 emulator
C++
general: fix type inconsistencies
Liamd55cc3b004bf
diff --git a/src/core/hle/kernel/k_address_space_info.cpp b/src/core/hle/kernel/k_address_space_info.cppindex 97972ebae7..c36eb5dc4c 100644--- a/src/core/hle/kernel/k_address_space_info.cpp+++ b/src/core/hle/kernel/k_address_space_info.cpp@@ -44,11 +44,11 @@ const KAddressSpaceInfo& GetAddressSpaceInfo(size_t width, KAddressSpaceInfo::Ty} // namespace-uintptr_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) {+std::size_t KAddressSpaceInfo::GetAddressSpaceStart(size_t width, KAddressSpaceInfo::Type type) {return GetAddressSpaceInfo(width, type).address;}-size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) {+std::size_t KAddressSpaceInfo::GetAddressSpaceSize(size_t width, KAddressSpaceInfo::Type type) {return GetAddressSpaceInfo(width, type).size;}diff --git a/src/core/hle/kernel/k_address_space_info.h b/src/core/hle/kernel/k_address_space_info.hindex 69e9d77f2b..9a26f6b906 100644--- a/src/core/hle/kernel/k_address_space_info.h+++ b/src/core/hle/kernel/k_address_space_info.h@@ -18,7 +18,7 @@ struct KAddressSpaceInfo final {Count,};- static u64 GetAddressSpaceStart(std::size_t width, Type type);+ static std::size_t GetAddressSpaceStart(std::size_t width, Type type);static std::size_t GetAddressSpaceSize(std::size_t width, Type type);const std::size_t bit_width{};diff --git a/src/core/hle/kernel/k_device_address_space.h b/src/core/hle/kernel/k_device_address_space.hindex 4709df9959..b4a014c387 100644--- a/src/core/hle/kernel/k_device_address_space.h+++ b/src/core/hle/kernel/k_device_address_space.h@@ -21,9 +21,9 @@ public:~KDeviceAddressSpace();Result Initialize(u64 address, u64 size);- void Finalize();+ void Finalize() override;- bool IsInitialized() const {+ bool IsInitialized() const override {return m_is_initialized;}static void PostDestroy(uintptr_t arg) {}diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cppindex b0153a5023..9cbcb3c8fa 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp@@ -238,7 +238,7 @@ private:return indices;}- void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) {+ void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) override {switch (index_type) {case VK_INDEX_TYPE_UINT8_EXT:std::memcpy(staging_data, MakeIndices<u8>(quad, first).data(), quad_size);@@ -278,7 +278,7 @@ private:return indices;}- void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) {+ void MakeAndUpdateIndices(u8* staging_data, size_t quad_size, u32 quad, u32 first) override {switch (index_type) {case VK_INDEX_TYPE_UINT8_EXT:std::memcpy(staging_data, MakeIndices<u8>(quad, first).data(), quad_size);