ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Fix tile cache palette set switching

This commit is contained in:
Jeffrey Pfau 2016-10-20 17:58:47 -07:00
parent 524e94edbf
commit 2f0501d3c4
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/tile-cache.c
View File

@ -56,6 +56,7 @@ static void _redoCacheSize(struct mTileCache* cache) {
if (!size) {
return;
}
cache->entriesPerTile = size;
unsigned tiles = mTileCacheSystemInfoGetMaxTiles(cache->sysConfig);
cache->cache = anonymousMemoryMap(8 * 8 * 2 * tiles * size);
cache->status = anonymousMemoryMap(tiles * size * sizeof(*cache->status));
@ -85,10 +86,9 @@ void mTileCacheDeinit(struct mTileCache* cache) {
void mTileCacheWriteVRAM(struct mTileCache* cache, uint32_t address) {
unsigned bpp = cache->bpp + 3;
unsigned count = cache->count;
unsigned count = cache->entriesPerTile;
size_t i;
for (i = 0; i < count; ++i) {
++cache->status[(address >> bpp) * count + i].vramVersion;
cache->status[(address >> bpp) * count + i].vramClean = 0;
}
}
@ -216,11 +216,17 @@ static inline uint16_t* _tileLookup(struct mTileCache* cache, unsigned tileId, u
const uint16_t* mTileCacheGetTile(struct mTileCache* cache, unsigned tileId, unsigned paletteId) {
unsigned cPaletteId = cache->activePalette;
unsigned count = cache->count;
unsigned count = cache->entriesPerTile;
unsigned bpp = cache->bpp;
struct mTileCacheEntry* status = &cache->status[tileId * count + paletteId];
struct mTileCacheEntry desiredStatus = {
.paletteVersion = cache->globalPaletteVersion[cPaletteId][paletteId],
.vramClean = 1,
.paletteId = paletteId,
.activePalette = cPaletteId
};
uint16_t* tile = _tileLookup(cache, tileId, paletteId);
if (!mTileCacheConfigurationIsShouldStore(cache->config) || !status->vramClean || status->paletteId != cPaletteId || status->paletteVersion != cache->globalPaletteVersion[cPaletteId][paletteId]) {
if (!mTileCacheConfigurationIsShouldStore(cache->config) || memcmp(status, &desiredStatus, sizeof(*status))) {
switch (bpp) {
case 0:
return NULL;
@ -234,20 +240,24 @@ const uint16_t* mTileCacheGetTile(struct mTileCache* cache, unsigned tileId, uns
_regenerateTile256(cache, tile, tileId, paletteId);
break;
}
status->paletteVersion = cache->globalPaletteVersion[cPaletteId][paletteId];
status->paletteId = cPaletteId;
status->vramClean = 1;
*status = desiredStatus;
}
return tile;
}
const uint16_t* mTileCacheGetTileIfDirty(struct mTileCache* cache, struct mTileCacheEntry* entry, unsigned tileId, unsigned paletteId) {
unsigned cPaletteId = cache->activePalette;
unsigned count = cache->count;
unsigned count = cache->entriesPerTile;
unsigned bpp = cache->bpp;
struct mTileCacheEntry* status = &cache->status[tileId * count + paletteId];
struct mTileCacheEntry desiredStatus = {
.paletteVersion = cache->globalPaletteVersion[cPaletteId][paletteId],
.vramClean = 1,
.paletteId = paletteId,
.activePalette = cPaletteId
};
uint16_t* tile = NULL;
if (!status->vramClean || status->paletteId != cPaletteId || status->paletteVersion != cache->globalPaletteVersion[cPaletteId][paletteId]) {
if (memcmp(status, &desiredStatus, sizeof(*status))) {
tile = _tileLookup(cache, tileId, paletteId);
switch (bpp) {
case 0:
@ -262,9 +272,7 @@ const uint16_t* mTileCacheGetTileIfDirty(struct mTileCache* cache, struct mTileC
_regenerateTile256(cache, tile, tileId, paletteId);
break;
}
status->paletteVersion = cache->globalPaletteVersion[cPaletteId][paletteId];
status->paletteId = cPaletteId;
status->vramClean = 1;
*status = desiredStatus;
}
if (memcmp(status, &entry[paletteId], sizeof(*status))) {
tile = _tileLookup(cache, tileId, paletteId);

3
src/core/tile-cache.h
View File

@ -20,9 +20,9 @@ DECL_BITS(mTileCacheSystemInfo, MaxTiles, 16, 13);
struct mTileCacheEntry {
uint32_t paletteVersion;
uint32_t vramVersion;
uint8_t vramClean;
uint8_t paletteId;
uint8_t activePalette;
};
struct mTileCache {
@ -33,6 +33,7 @@ struct mTileCache {
int activePalette;
unsigned entries;
unsigned count;
unsigned entriesPerTile;
unsigned bpp;
uint16_t* vram;