Minor fixes to some 'for' and 'includes'.

This commit is contained in:
Franco 2023-09-18 02:33:23 -03:00
commit 2db3a20ff9
8 changed files with 13 additions and 17 deletions

View file

@ -4,8 +4,8 @@
#ifdef _WIN32 #ifdef _WIN32
#include <iterator> #include <iterator>
#include <tsl/robin_map.h>
#include <boost/icl/separate_interval_set.hpp> #include <boost/icl/separate_interval_set.hpp>
#include <tsl/robin_map.h>
#include <windows.h> #include <windows.h>
#include "common/dynamic_library.h" #include "common/dynamic_library.h"
@ -347,8 +347,8 @@ private:
PFN_MapViewOfFile3 pfn_MapViewOfFile3{}; PFN_MapViewOfFile3 pfn_MapViewOfFile3{};
PFN_UnmapViewOfFile2 pfn_UnmapViewOfFile2{}; PFN_UnmapViewOfFile2 pfn_UnmapViewOfFile2{};
std::mutex placeholder_mutex; ///< Mutex for placeholders std::mutex placeholder_mutex; ///< Mutex for placeholders
boost::icl::separate_interval_set<size_t> placeholders; ///< Mapped placeholders boost::icl::separate_interval_set<size_t> placeholders; ///< Mapped placeholders
tsl::robin_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset tsl::robin_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset
}; };

View file

@ -6,9 +6,9 @@
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include <tsl/robin_map.h>
#include <dynarmic/interface/A32/a32.h> #include <dynarmic/interface/A32/a32.h>
#include <dynarmic/interface/A64/a64.h> #include <dynarmic/interface/A64/a64.h>
#include <tsl/robin_map.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/hash.h" #include "common/hash.h"
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"

View file

@ -150,9 +150,8 @@ private:
std::list<std::shared_ptr<Handle>> unmap_queue{}; std::list<std::shared_ptr<Handle>> unmap_queue{};
std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue` std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue`
tsl::robin_map<Handle::Id, std::shared_ptr<Handle>> tsl::robin_map<Handle::Id, std::shared_ptr<Handle>> handles{}; //!< Main owning map of handles
handles{}; //!< Main owning map of handles std::mutex handles_lock; //!< Protects access to `handles`
std::mutex handles_lock; //!< Protects access to `handles`
static constexpr u32 HandleIdIncrement{ static constexpr u32 HandleIdIncrement{
4}; //!< Each new handle ID is an increment of 4 from the previous 4}; //!< Each new handle ID is an increment of 4 from the previous

View file

@ -10,9 +10,9 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include <tsl/robin_map.h>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <tsl/robin_map.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/fiber.h" #include "common/fiber.h"

View file

@ -4,8 +4,8 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include <tsl/robin_map.h>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <tsl/robin_map.h>
#include "common/alignment.h" #include "common/alignment.h"
#include "common/common_types.h" #include "common/common_types.h"

View file

@ -5,7 +5,6 @@
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <unordered_map>
#include <tsl/robin_map.h> #include <tsl/robin_map.h>
#include "common/common_types.h" #include "common/common_types.h"
@ -27,8 +26,7 @@ public:
private: private:
Engines::Maxwell3D& maxwell3d; Engines::Maxwell3D& maxwell3d;
tsl::robin_map<u64, std::function<std::unique_ptr<CachedMacro>(Engines::Maxwell3D&)>> tsl::robin_map<u64, std::function<std::unique_ptr<CachedMacro>(Engines::Maxwell3D&)>> builders;
builders; };
};
} // namespace Tegra } // namespace Tegra

View file

@ -1,8 +1,8 @@
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <tsl/robin_map.h>
#include <boost/container/static_vector.hpp> #include <boost/container/static_vector.hpp>
#include <tsl/robin_map.h>
#include "video_core/renderer_vulkan/maxwell_to_vk.h" #include "video_core/renderer_vulkan/maxwell_to_vk.h"
#include "video_core/renderer_vulkan/vk_render_pass_cache.h" #include "video_core/renderer_vulkan/vk_render_pass_cache.h"

View file

@ -1982,9 +1982,8 @@ void TextureCache<P>::UnregisterImage(ImageId image_id) {
image.flags &= ~ImageFlagBits::BadOverlap; image.flags &= ~ImageFlagBits::BadOverlap;
lru_cache.Free(image.lru_index); lru_cache.Free(image.lru_index);
const auto& clear_page_table = const auto& clear_page_table =
[image_id](u64 page, [image_id](u64 page, tsl::robin_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>&
tsl::robin_map<u64, std::vector<ImageId>, Common::IdentityHash<u64>>& selected_page_table) {
selected_page_table) {
const auto page_it = selected_page_table.find(page); const auto page_it = selected_page_table.find(page);
if (page_it == selected_page_table.end()) { if (page_it == selected_page_table.end()) {
ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS); ASSERT_MSG(false, "Unregistering unregistered page=0x{:x}", page << YUZU_PAGEBITS);