diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index a5e6951559..ce9c8fbe23 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -1219,7 +1219,6 @@ void TextureCacheCommon::DecodeTextureLevel(u8 *out, int outPitch, GETextureForm case GE_CMODE_16BIT_ABGR5551: case GE_CMODE_16BIT_ABGR4444: { - const u16 *clut = GetCurrentClut() + clutSharingOffset; if (clutAlphaLinear_ && mipmapShareClut && !expandTo32bit) { // Here, reverseColors means the CLUT is already reversed. if (reverseColors) { @@ -1232,6 +1231,7 @@ void TextureCacheCommon::DecodeTextureLevel(u8 *out, int outPitch, GETextureForm } } } else { + const u16 *clut = GetCurrentClut() + clutSharingOffset; if (expandTo32bit && !reverseColors) { // We simply expand the CLUT to 32-bit, then we deindex as usual. Probably the fastest way. ConvertFormatToRGBA8888(clutformat, expandClut_, clut, 16); diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h index 90419444fd..236d680595 100644 --- a/UI/GameInfoCache.h +++ b/UI/GameInfoCache.h @@ -61,12 +61,6 @@ class FileLoader; enum class IdentifiedFileType; struct GameInfoTex { - GameInfoTex() {} - ~GameInfoTex() { - if (texture) { - ELOG("LEAKED GameInfoTex"); - } - } std::string data; std::unique_ptr texture; // The time at which the Icon and the BG were loaded. @@ -81,8 +75,6 @@ struct GameInfoTex { } texture.reset(nullptr); } -private: - DISALLOW_COPY_AND_ASSIGN(GameInfoTex); }; class GameInfo {