diff options
| author | flacs <tilkax@gmail.com> | 2015-11-06 15:49:38 +0100 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-11-06 15:49:38 +0100 |
| commit | 318a07dc104803b2ed4134d9a6cde55e28784255 (patch) | |
| tree | 8d26ac16848ebf2961229979e7ac9c07bb36759e /Source/Core/VideoCommon/TextureCacheBase.h | |
| parent | f26b3708e7c4979dc9a7cb5d0a6b55ee68cf637d (diff) | |
| parent | 2ad901b2da570673797ea822d56c1bb3f6c58984 (diff) | |
Merge pull request #3236 from Tilka/cleanup2
VideoCommon: small cleanup
Diffstat (limited to 'Source/Core/VideoCommon/TextureCacheBase.h')
| -rw-r--r-- | Source/Core/VideoCommon/TextureCacheBase.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index e7d274818c..9e7b4a7c71 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<u64> { - 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<u64>::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); @@ -139,12 +139,10 @@ 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: - TextureCache(); + TextureCacheBase(); alignas(16) static u8* temp; static size_t temp_size; @@ -180,4 +178,4 @@ private: } backup_config; }; -extern TextureCache *g_texture_cache; +extern TextureCacheBase* g_texture_cache; |