VERY experimental Nintendo Switch 2 emulator
C++
VideoCore: Move Slot Vector to Common
Fernando Sahmkow4d97c54676ea
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txtindex 85926fc8f5..bf3f3b7814 100644--- a/src/common/CMakeLists.txt+++ b/src/common/CMakeLists.txt@@ -121,6 +121,7 @@ add_library(common STATICsettings_input.cppsettings_input.hsettings_setting.h+ slot_vector.hsocket_types.hspin_lock.cppspin_lock.hdiff --git a/src/video_core/texture_cache/slot_vector.h b/src/common/slot_vector.hsimilarity index 97%rename from src/video_core/texture_cache/slot_vector.hrename to src/common/slot_vector.hindex 3ffa2a6617..34ff7de941 100644--- a/src/video_core/texture_cache/slot_vector.h+++ b/src/common/slot_vector.h@@ -14,7 +14,7 @@#include "common/common_types.h"#include "common/polyfill_ranges.h"-namespace VideoCommon {+namespace Common {struct SlotId {static constexpr u32 INVALID_INDEX = std::numeric_limits<u32>::max();@@ -217,11 +217,11 @@ private:std::vector<u32> free_list;};-} // namespace VideoCommon+} // namespace Commontemplate <>-struct std::hash<VideoCommon::SlotId> {- size_t operator()(const VideoCommon::SlotId& id) const noexcept {+struct std::hash<Common::SlotId> {+ size_t operator()(const Common::SlotId& id) const noexcept {return std::hash<u32>{}(id.index);}};diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txtindex 16c905db9c..55180f4b5c 100644--- a/src/video_core/CMakeLists.txt+++ b/src/video_core/CMakeLists.txt@@ -274,7 +274,6 @@ add_library(video_core STATICtexture_cache/image_view_info.htexture_cache/render_targets.htexture_cache/samples_helper.h- texture_cache/slot_vector.htexture_cache/texture_cache.cpptexture_cache/texture_cache.htexture_cache/texture_cache_base.hdiff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.hindex 80dbb81e7f..59124458df 100644--- a/src/video_core/buffer_cache/buffer_cache_base.h+++ b/src/video_core/buffer_cache/buffer_cache_base.h@@ -41,7 +41,7 @@#include "video_core/engines/maxwell_3d.h"#include "video_core/memory_manager.h"#include "video_core/surface.h"-#include "video_core/texture_cache/slot_vector.h"+#include "common/slot_vector.h"#include "video_core/texture_cache/types.h"namespace boost {@@ -55,7 +55,7 @@ MICROPROFILE_DECLARE(GPU_PrepareBuffers);MICROPROFILE_DECLARE(GPU_BindUploadBuffers);MICROPROFILE_DECLARE(GPU_DownloadMemory);-using BufferId = SlotId;+using BufferId = Common::SlotId;using VideoCore::Surface::PixelFormat;using namespace Common::Literals;@@ -559,7 +559,7 @@ private:Tegra::MaxwellDeviceMemoryManager& device_memory;- SlotVector<Buffer> slot_buffers;+ Common::SlotVector<Buffer> slot_buffers;DelayedDestructionRing<Buffer, 8> delayed_destruction_ring;const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect{};diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.hindex 4861b123a2..e1019f2285 100644--- a/src/video_core/query_cache.h+++ b/src/video_core/query_cache.h@@ -18,12 +18,12 @@#include "common/assert.h"#include "common/settings.h"+#include "common/slot_vector.h"#include "video_core/control/channel_state_cache.h"#include "video_core/engines/maxwell_3d.h"#include "video_core/host1x/gpu_device_memory_manager.h"#include "video_core/memory_manager.h"#include "video_core/rasterizer_interface.h"-#include "video_core/texture_cache/slot_vector.h"namespace VideoCore {enum class QueryType {@@ -37,7 +37,7 @@ constexpr std::size_t NumQueryTypes = static_cast<size_t>(QueryType::Count);namespace VideoCommon {-using AsyncJobId = SlotId;+using AsyncJobId = Common::SlotId;static constexpr AsyncJobId NULL_ASYNC_JOB_ID{0};@@ -341,7 +341,7 @@ private:static constexpr std::uintptr_t YUZU_PAGESIZE = 4096;static constexpr unsigned YUZU_PAGEBITS = 12;- SlotVector<AsyncJob> slot_async_jobs;+ Common::SlotVector<AsyncJob> slot_async_jobs;VideoCore::RasterizerInterface& rasterizer;Tegra::MaxwellDeviceMemoryManager& device_memory;diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.hindex af34c272b3..022275fd68 100644--- a/src/video_core/renderer_opengl/gl_buffer_cache.h+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h@@ -90,7 +90,7 @@ public:void PostCopyBarrier();void Finish();- void TickFrame(VideoCommon::SlotVector<Buffer>&) noexcept {}+ void TickFrame(Common::SlotVector<Buffer>&) noexcept {}void ClearBuffer(Buffer& dest_buffer, u32 offset, size_t size, u32 value);diff --git a/src/video_core/renderer_opengl/gl_texture_cache.h b/src/video_core/renderer_opengl/gl_texture_cache.hindex 3e54edcc21..d4165d8e4d 100644--- a/src/video_core/renderer_opengl/gl_texture_cache.h+++ b/src/video_core/renderer_opengl/gl_texture_cache.h@@ -30,13 +30,13 @@ class Image;class ImageView;class Sampler;+using Common::SlotVector;using VideoCommon::ImageId;using VideoCommon::ImageViewId;using VideoCommon::ImageViewType;using VideoCommon::NUM_RT;using VideoCommon::Region2D;using VideoCommon::RenderTargets;-using VideoCommon::SlotVector;struct FormatProperties {GLenum compatibility_class;diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cppindex 31001d1428..e5e1e3ab63 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp@@ -368,7 +368,7 @@ u32 BufferCacheRuntime::GetStorageBufferAlignment() const {return static_cast<u32>(device.GetStorageBufferAlignment());}-void BufferCacheRuntime::TickFrame(VideoCommon::SlotVector<Buffer>& slot_buffers) noexcept {+void BufferCacheRuntime::TickFrame(Common::SlotVector<Buffer>& slot_buffers) noexcept {for (auto it = slot_buffers.begin(); it != slot_buffers.end(); it++) {it->ResetUsageTracking();}diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.hindex e273f49884..ac14c9f866 100644--- a/src/video_core/renderer_vulkan/vk_buffer_cache.h+++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h@@ -81,7 +81,7 @@ public:ComputePassDescriptorQueue& compute_pass_descriptor_queue,DescriptorPool& descriptor_pool);- void TickFrame(VideoCommon::SlotVector<Buffer>& slot_buffers) noexcept;+ void TickFrame(Common::SlotVector<Buffer>& slot_buffers) noexcept;void Finish();diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.hindex 0dbde65d6b..aaeb5ef934 100644--- a/src/video_core/renderer_vulkan/vk_texture_cache.h+++ b/src/video_core/renderer_vulkan/vk_texture_cache.h@@ -20,11 +20,11 @@ struct ResolutionScalingInfo;namespace Vulkan {+using Common::SlotVector;using VideoCommon::ImageId;using VideoCommon::NUM_RT;using VideoCommon::Region2D;using VideoCommon::RenderTargets;-using VideoCommon::SlotVector;using VideoCore::Surface::PixelFormat;class BlitImageHelper;diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.hindex e7b9101215..da98a634b5 100644--- a/src/video_core/texture_cache/texture_cache_base.h+++ b/src/video_core/texture_cache/texture_cache_base.h@@ -21,6 +21,7 @@#include "common/lru_cache.h"#include "common/polyfill_ranges.h"#include "common/scratch_buffer.h"+#include "common/slot_vector.h"#include "common/thread_worker.h"#include "video_core/compatible_formats.h"#include "video_core/control/channel_state_cache.h"@@ -32,7 +33,6 @@#include "video_core/texture_cache/image_info.h"#include "video_core/texture_cache/image_view_base.h"#include "video_core/texture_cache/render_targets.h"-#include "video_core/texture_cache/slot_vector.h"#include "video_core/texture_cache/types.h"#include "video_core/textures/texture.h"@@ -451,16 +451,16 @@ private:struct PendingDownload {bool is_swizzle;size_t async_buffer_id;- SlotId object_id;+ Common::SlotId object_id;};- SlotVector<Image> slot_images;- SlotVector<ImageMapView> slot_map_views;- SlotVector<ImageView> slot_image_views;- SlotVector<ImageAlloc> slot_image_allocs;- SlotVector<Sampler> slot_samplers;- SlotVector<Framebuffer> slot_framebuffers;- SlotVector<BufferDownload> slot_buffer_downloads;+ Common::SlotVector<Image> slot_images;+ Common::SlotVector<ImageMapView> slot_map_views;+ Common::SlotVector<ImageView> slot_image_views;+ Common::SlotVector<ImageAlloc> slot_image_allocs;+ Common::SlotVector<Sampler> slot_samplers;+ Common::SlotVector<Framebuffer> slot_framebuffers;+ Common::SlotVector<BufferDownload> slot_buffer_downloads;// TODO: This data structure is not optimal and it should be reworkeddiff --git a/src/video_core/texture_cache/types.h b/src/video_core/texture_cache/types.hindex 0453456b4b..07c3043865 100644--- a/src/video_core/texture_cache/types.h+++ b/src/video_core/texture_cache/types.h@@ -5,21 +5,21 @@#include "common/common_funcs.h"#include "common/common_types.h"-#include "video_core/texture_cache/slot_vector.h"+#include "common/slot_vector.h"namespace VideoCommon {constexpr size_t NUM_RT = 8;constexpr size_t MAX_MIP_LEVELS = 14;-constexpr SlotId CORRUPT_ID{0xfffffffe};+constexpr Common::SlotId CORRUPT_ID{0xfffffffe};-using ImageId = SlotId;-using ImageMapId = SlotId;-using ImageViewId = SlotId;-using ImageAllocId = SlotId;-using SamplerId = SlotId;-using FramebufferId = SlotId;+using ImageId = Common::SlotId;+using ImageMapId = Common::SlotId;+using ImageViewId = Common::SlotId;+using ImageAllocId = Common::SlotId;+using SamplerId = Common::SlotId;+using FramebufferId = Common::SlotId;/// Fake image ID for null image viewsconstexpr ImageId NULL_IMAGE_ID{0};