diff options
| author | iwubcode <iwubcode@users.noreply.github.com> | 2023-06-02 14:07:42 -0500 |
|---|---|---|
| committer | iwubcode <iwubcode@users.noreply.github.com> | 2023-06-02 14:07:42 -0500 |
| commit | e028d2ead082c812efc5391c4dab3b08e298d441 (patch) | |
| tree | 164ba5fc57c723453915107f2542cffcd3152b1f /Source/Core/VideoCommon | |
| parent | 45a21ef83f4742b9d58ea8d50c4f1ee0bad84f3b (diff) | |
VideoCommon: move custom texture data to assets
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Assets/CustomAssetLibrary.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Assets/CustomTextureData.cpp (renamed from Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.cpp) | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Assets/CustomTextureData.h (renamed from Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h) | 0 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/HiresTextures.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/Assets/CustomAssetLibrary.cpp b/Source/Core/VideoCommon/Assets/CustomAssetLibrary.cpp index 062f5801e1..025da4559b 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetLibrary.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAssetLibrary.cpp @@ -6,7 +6,7 @@ #include <algorithm> #include "Common/Logging/Log.h" -#include "VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h" +#include "VideoCommon/Assets/CustomTextureData.h" namespace VideoCommon { diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.cpp b/Source/Core/VideoCommon/Assets/CustomTextureData.cpp index 10b84b4a7a..26b65ad365 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.cpp +++ b/Source/Core/VideoCommon/Assets/CustomTextureData.cpp @@ -1,7 +1,7 @@ // Copyright 2023 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h" +#include "VideoCommon/Assets/CustomTextureData.h" #include <algorithm> #include <cstddef> diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h b/Source/Core/VideoCommon/Assets/CustomTextureData.h index 9a16bf1db0..9a16bf1db0 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h +++ b/Source/Core/VideoCommon/Assets/CustomTextureData.h diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index d8e1825ad1..7ad8f45681 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -12,6 +12,8 @@ add_library(videocommon Assets/CustomAsset.h Assets/CustomAssetLibrary.cpp Assets/CustomAssetLibrary.h + Assets/CustomTextureData.cpp + Assets/CustomTextureData.h AsyncRequests.cpp AsyncRequests.h AsyncShaderCompiler.cpp @@ -69,8 +71,6 @@ add_library(videocommon GraphicsModSystem/Runtime/Actions/ScaleAction.h GraphicsModSystem/Runtime/Actions/SkipAction.cpp GraphicsModSystem/Runtime/Actions/SkipAction.h - GraphicsModSystem/Runtime/CustomTextureData.cpp - GraphicsModSystem/Runtime/CustomTextureData.h GraphicsModSystem/Runtime/FBInfo.cpp GraphicsModSystem/Runtime/FBInfo.h GraphicsModSystem/Runtime/GraphicsModAction.h diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h index 2381d24bd6..0c0ea2adad 100644 --- a/Source/Core/VideoCommon/HiresTextures.h +++ b/Source/Core/VideoCommon/HiresTextures.h @@ -9,7 +9,7 @@ #include <vector> #include "Common/CommonTypes.h" -#include "VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h" +#include "VideoCommon/Assets/CustomTextureData.h" #include "VideoCommon/TextureConfig.h" #include "VideoCommon/TextureInfo.h" diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 57808f9de6..5b0bde53ca 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -36,9 +36,9 @@ #include "VideoCommon/AbstractFramebuffer.h" #include "VideoCommon/AbstractGfx.h" #include "VideoCommon/AbstractStagingTexture.h" +#include "VideoCommon/Assets/CustomTextureData.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/FramebufferManager.h" -#include "VideoCommon/GraphicsModSystem/Runtime/CustomTextureData.h" #include "VideoCommon/GraphicsModSystem/Runtime/FBInfo.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h" #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h" |