Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Assorted cleanup

Browse source
This commit is contained in:
Henrik Rydgård 2019-09-27 23:25:30 +02:00
parent 382d5a6b95
commit 9c4649d3ac
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GPU/Common/TextureCacheCommon.cpp
View file

@ -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<u16>() + 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<u16>() + 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);

8
UI/GameInfoCache.h
View file

@ -61,12 +61,6 @@ class FileLoader;
enum class IdentifiedFileType;
struct GameInfoTex {
GameInfoTex() {}
~GameInfoTex() {
if (texture) {
ELOG("LEAKED GameInfoTex");
}
}
std::string data;
std::unique_ptr<ManagedTexture> 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 {