From 9230d04a0a99aecb6edd4c9a487b107610bbc22e Mon Sep 17 00:00:00 2001 From: psucien Date: Sat, 8 Jun 2024 01:19:51 +0200 Subject: [PATCH] common: slot_vector moved into common --- CMakeLists.txt | 2 +- src/{video_core/texture_cache => common}/slot_vector.h | 0 src/video_core/texture_cache/texture_cache.h | 2 +- src/video_core/texture_cache/types.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{video_core/texture_cache => common}/slot_vector.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17ca8ec0..80f47b2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,6 +235,7 @@ set(COMMON src/common/logging/backend.cpp src/common/rdtsc.cpp src/common/rdtsc.h src/common/singleton.h + src/common/slot_vector.h src/common/string_util.cpp src/common/string_util.h src/common/thread.cpp @@ -415,7 +416,6 @@ set(VIDEO_CORE src/video_core/amdgpu/liverpool.cpp src/video_core/texture_cache/image_view.h src/video_core/texture_cache/sampler.cpp src/video_core/texture_cache/sampler.h - src/video_core/texture_cache/slot_vector.h src/video_core/texture_cache/texture_cache.cpp src/video_core/texture_cache/texture_cache.h src/video_core/texture_cache/tile_manager.cpp diff --git a/src/video_core/texture_cache/slot_vector.h b/src/common/slot_vector.h similarity index 100% rename from src/video_core/texture_cache/slot_vector.h rename to src/common/slot_vector.h diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 20ae5bd5..d37acd21 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -7,12 +7,12 @@ #include #include +#include "common/slot_vector.h" #include "video_core/amdgpu/resource.h" #include "video_core/renderer_vulkan/vk_stream_buffer.h" #include "video_core/texture_cache/image.h" #include "video_core/texture_cache/image_view.h" #include "video_core/texture_cache/sampler.h" -#include "video_core/texture_cache/slot_vector.h" #include "video_core/texture_cache/tile_manager.h" namespace Core::Libraries::VideoOut { diff --git a/src/video_core/texture_cache/types.h b/src/video_core/texture_cache/types.h index 4ba856c0..335d6d83 100644 --- a/src/video_core/texture_cache/types.h +++ b/src/video_core/texture_cache/types.h @@ -3,8 +3,8 @@ #pragma once +#include "common/slot_vector.h" #include "common/types.h" -#include "video_core/texture_cache/slot_vector.h" namespace VideoCore {