From e374ea6b21e5117c8410c18f5dcceaf3e6f73fc7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 20 Aug 2022 17:32:45 -0700 Subject: [PATCH] GPU: Restrict mip CLUT enhancement a bit. Can't replicate this behavior on a real PSP. In case a game sets the separate CLUT flag by accident, ignore except in a safe case that occurs in Misshitsu no Sacrifice. See #15727. --- GPU/Common/TextureCacheCommon.cpp | 4 +++- GPU/GPUState.h | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 014b8feb3a..af642a7df1 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -1666,7 +1666,9 @@ CheckAlphaResult TextureCacheCommon::ReadIndexedTex(u8 *out, int outPitch, int l texptr = (u8 *)tmpTexBuf32_.data(); } - const bool mipmapShareClut = gstate.isClutSharedForMipmaps(); + // Misshitsu no Sacrifice has separate CLUT data, this is a hack to allow it. + // Normally separate CLUTs are not allowed for 8-bit or higher indices. + const bool mipmapShareClut = gstate.isClutSharedForMipmaps() && gstate.getClutLoadBlocks() == 0x40; const int clutSharingOffset = mipmapShareClut ? 0 : (level & 1) * 256; GEPaletteFormat palFormat = (GEPaletteFormat)gstate.getClutPaletteFormat(); diff --git a/GPU/GPUState.h b/GPU/GPUState.h index 6aaa79a8fd..ae1c2c6510 100644 --- a/GPU/GPUState.h +++ b/GPU/GPUState.h @@ -300,8 +300,14 @@ struct GPUgstate { bool isTextureFormatIndexed() const { return (texformat & 4) != 0; } // GE_TFMT_CLUT4 - GE_TFMT_CLUT32 are 0b1xx. int getTextureEnvColRGB() const { return texenvcolor & 0x00FFFFFF; } u32 getClutAddress() const { return (clutaddr & 0x00FFFFF0) | ((clutaddrupper << 8) & 0x0F000000); } - int getClutLoadBytes() const { return (loadclut & 0x7F) * 32; } - int getClutLoadBlocks() const { return (loadclut & 0x7F); } + int getClutLoadBytes() const { return getClutLoadBlocks() * 32; } + int getClutLoadBlocks() const { + // The PSP only supports 0x3F, but Misshitsu no Sacrifice has extra color data (see #15727.) + // 0x40 would be 0, which would be a no-op, so we allow it. + if ((loadclut & 0x7F) == 0x40) + return 0x40; + return loadclut & 0x3F; + } GEPaletteFormat getClutPaletteFormat() const { return static_cast(clutformat & 3); } int getClutIndexShift() const { return (clutformat >> 2) & 0x1F; } int getClutIndexMask() const { return (clutformat >> 8) & 0xFF; }