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

Move shared clut check to gstate.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-12-08 23:11:56 -08:00
parent cdccf06b62
commit c6a441965e
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GPU/Directx9/TextureCacheDX9.cpp
View file

@ -1092,7 +1092,7 @@ void *TextureCacheDX9::DecodeTextureLevel(GETextureFormat format, GEPaletteForma
{
dstFmt = getClutDestFormat(clutformat);
const bool mipmapShareClut = (gstate.texmode & 0x100) == 0;
const bool mipmapShareClut = gstate.isClutSharedForMipmaps();
const int clutSharingOffset = mipmapShareClut ? 0 : level * 16;
switch (clutformat) {

2
GPU/GLES/TextureCache.cpp
View file

@ -1221,7 +1221,7 @@ void *TextureCache::DecodeTextureLevel(GETextureFormat format, GEPaletteFormat c
switch (format) {
case GE_TFMT_CLUT4:
{
const bool mipmapShareClut = (gstate.texmode & 0x100) == 0;
const bool mipmapShareClut = gstate.isClutSharedForMipmaps();
const int clutSharingOffset = mipmapShareClut ? 0 : level * 16;
switch (clutformat) {

1
GPU/GPUState.h
View file

@ -307,6 +307,7 @@ struct GPUgstate
int transformClutIndex(int index) const { return ((index >> getClutIndexShift()) & getClutIndexMask()) | getClutIndexStartPos(); }
bool isClutIndexSimple() const { return (clutformat & ~3) == 0xC500FF00; } // Meaning, no special mask, shift, or start pos.
bool isTextureSwizzled() const { return texmode & 1; }
bool isClutSharedForMipmaps() const { return (texmode & 0x100) != 0; }
// Lighting
bool isLightingEnabled() const { return lightingEnable & 1; }

2
GPU/Software/Rasterizer.cpp
View file

@ -74,7 +74,7 @@ static inline int GetPixelDataOffset(unsigned int row_pitch_bits, unsigned int u
static inline u32 LookupColor(unsigned int index, unsigned int level)
{
const bool mipmapShareClut = (gstate.texmode & 0x100) == 0;
const bool mipmapShareClut = gstate.isClutSharedForMipmaps();
const int clutSharingOffset = mipmapShareClut ? 0 : level * 16;
// TODO: No idea if these bswaps are correct