summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryzct12345 <87620833+yzct12345@users.noreply.github.com>2021-08-08 13:02:51 +0200
committerGitHub <noreply@github.com>2021-08-08 13:02:51 +0200
commitc4eafcc86142e1de764748659d74a27c97930dc8 (patch)
treea9e6f842d3d90cb679bd49a993d8010e0f3168b6
parenttexture_cache: Address ameerj's review (diff)
downloadyuzu-c4eafcc86142e1de764748659d74a27c97930dc8.tar
yuzu-c4eafcc86142e1de764748659d74a27c97930dc8.tar.gz
yuzu-c4eafcc86142e1de764748659d74a27c97930dc8.tar.bz2
yuzu-c4eafcc86142e1de764748659d74a27c97930dc8.tar.lz
yuzu-c4eafcc86142e1de764748659d74a27c97930dc8.tar.xz
yuzu-c4eafcc86142e1de764748659d74a27c97930dc8.tar.zst
yuzu-c4eafcc86142e1de764748659d74a27c97930dc8.zip
-rw-r--r--src/video_core/texture_cache/image_view_info.cpp2
-rw-r--r--src/video_core/texture_cache/texture_cache.h2
-rw-r--r--src/video_core/texture_cache/texture_cache_base.h7
3 files changed, 4 insertions, 7 deletions
diff --git a/src/video_core/texture_cache/image_view_info.cpp b/src/video_core/texture_cache/image_view_info.cpp
index f14a92565..6527e14c8 100644
--- a/src/video_core/texture_cache/image_view_info.cpp
+++ b/src/video_core/texture_cache/image_view_info.cpp
@@ -14,6 +14,8 @@ namespace VideoCommon {
namespace {
+using Tegra::Texture::TextureType;
+
constexpr u8 RENDER_TARGET_SWIZZLE = std::numeric_limits<u8>::max();
[[nodiscard]] u8 CastSwizzle(SwizzleSource source) {
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 40953afb7..a087498ff 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -4,6 +4,8 @@
#pragma once
+#include "common/alignment.h"
+#include "common/settings.h"
#include "video_core/dirty_flags.h"
#include "video_core/texture_cache/samples_helper.h"
#include "video_core/texture_cache/texture_cache_base.h"
diff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.h
index b72448c0d..e4ae351cb 100644
--- a/src/video_core/texture_cache/texture_cache_base.h
+++ b/src/video_core/texture_cache/texture_cache_base.h
@@ -10,15 +10,10 @@
#include <type_traits>
#include <unordered_map>
#include <unordered_set>
-#include <utility>
#include <vector>
-#include <boost/container/small_vector.hpp>
-
-#include "common/alignment.h"
#include "common/common_types.h"
#include "common/literals.h"
-#include "common/settings.h"
#include "video_core/compatible_formats.h"
#include "video_core/delayed_destruction_ring.h"
#include "video_core/engines/fermi_2d.h"
@@ -40,7 +35,6 @@
namespace VideoCommon {
using Tegra::Texture::SwizzleSource;
-using Tegra::Texture::TextureType;
using Tegra::Texture::TICEntry;
using Tegra::Texture::TSCEntry;
using VideoCore::Surface::GetFormatType;
@@ -48,7 +42,6 @@ using VideoCore::Surface::IsCopyCompatible;
using VideoCore::Surface::PixelFormat;
using VideoCore::Surface::PixelFormatFromDepthFormat;
using VideoCore::Surface::PixelFormatFromRenderTargetFormat;
-using VideoCore::Surface::SurfaceType;
using namespace Common::Literals;
template <class P>