From 81d9cce70c5a41b2791ab9cd5e69d4732becc34d Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Fri, 6 Nov 2015 01:28:05 +0100 Subject: VideoCommon: rename TextureCache to TextureCacheBase --- Source/Core/VideoCommon/TextureCacheBase.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoCommon/TextureCacheBase.h') diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index e7d274818c..9ecb61c8ae 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -17,7 +17,7 @@ struct VideoConfig; -class TextureCache +class TextureCacheBase { public: struct TCacheEntryConfig @@ -35,7 +35,7 @@ public: struct Hasher : std::hash { - size_t operator()(const TextureCache::TCacheEntryConfig& c) const + size_t operator()(const TextureCacheBase::TCacheEntryConfig& c) const { u64 id = (u64)c.rendertarget << 63 | (u64)c.layers << 48 | (u64)c.levels << 32 | (u64)c.height << 16 | (u64)c.width; return std::hash::operator()(id); @@ -118,7 +118,7 @@ public: u64 CalculateHash() const; }; - virtual ~TextureCache(); // needs virtual for DX11 dtor + virtual ~TextureCacheBase(); // needs virtual for DX11 dtor static void OnConfigChanged(VideoConfig& config); @@ -144,7 +144,7 @@ public: virtual void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) = 0; protected: - TextureCache(); + TextureCacheBase(); alignas(16) static u8* temp; static size_t temp_size; @@ -180,4 +180,4 @@ private: } backup_config; }; -extern TextureCache *g_texture_cache; +extern TextureCacheBase* g_texture_cache; -- cgit v1.2.3 From 2ad901b2da570673797ea822d56c1bb3f6c58984 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Fri, 6 Nov 2015 00:47:50 +0100 Subject: VideoCommon: drop unused variable/setter --- Source/Core/VideoCommon/TextureCacheBase.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source/Core/VideoCommon/TextureCacheBase.h') diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index 9ecb61c8ae..9e7b4a7c71 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -139,8 +139,6 @@ public: static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, u32 dstStride, PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf); - static void RequestInvalidateTextureCache(); - virtual void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) = 0; protected: -- cgit v1.2.3