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

DS Video: Fix last commit

This commit is contained in:
Vicki Pfau 2017-04-09 21:04:56 -07:00
parent 2930340178
commit 7c4a220bbb
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/ds/video.c
View File

@ -427,9 +427,9 @@ void DSVideoConfigureVRAM(struct DS* ds, int index, uint8_t value, uint8_t oldVa
case MODE_A_BG: case MODE_A_BG:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
if (ds->video.vramABG[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) { if (ds->video.vramABG[i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
ds->video.vramABG[offset + i + j] = NULL; ds->video.vramABG[i + j] = NULL;
ds->video.renderer->vramABG[offset + i + j] = NULL; ds->video.renderer->vramABG[i + j] = NULL;
} }
} }
} }
@ -437,9 +437,9 @@ void DSVideoConfigureVRAM(struct DS* ds, int index, uint8_t value, uint8_t oldVa
case MODE_B_BG: case MODE_B_BG:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
if (ds->video.vramBBG[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) { if (ds->video.vramBBG[i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
ds->video.vramBBG[offset + i + j] = NULL; ds->video.vramBBG[i + j] = NULL;
ds->video.renderer->vramBBG[offset + i + j] = NULL; ds->video.renderer->vramBBG[i + j] = NULL;
} }
} }
} }
@ -447,9 +447,9 @@ void DSVideoConfigureVRAM(struct DS* ds, int index, uint8_t value, uint8_t oldVa
case MODE_A_OBJ: case MODE_A_OBJ:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
if (ds->video.vramAOBJ[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) { if (ds->video.vramAOBJ[i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
ds->video.vramAOBJ[offset + i + j] = NULL; ds->video.vramAOBJ[i + j] = NULL;
ds->video.renderer->vramAOBJ[offset + i + j] = NULL; ds->video.renderer->vramAOBJ[i + j] = NULL;
} }
} }
} }
@ -457,9 +457,9 @@ void DSVideoConfigureVRAM(struct DS* ds, int index, uint8_t value, uint8_t oldVa
case MODE_B_OBJ: case MODE_B_OBJ:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
if (ds->video.vramBOBJ[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) { if (ds->video.vramBOBJ[i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
ds->video.vramBOBJ[offset + i + j] = NULL; ds->video.vramBOBJ[i + j] = NULL;
ds->video.renderer->vramBOBJ[offset + i + j] = NULL; ds->video.renderer->vramBOBJ[i + j] = NULL;
} }
} }
} }
@ -537,34 +537,34 @@ void DSVideoConfigureVRAM(struct DS* ds, int index, uint8_t value, uint8_t oldVa
} }
switch (info.mode) { switch (info.mode) {
case MODE_A_BG: case MODE_A_BG:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += info.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
ds->video.vramABG[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]; ds->video.vramABG[i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
ds->video.renderer->vramABG[offset + i + j] = ds->video.vramABG[offset + i + j]; ds->video.renderer->vramABG[i + j] = ds->video.vramABG[i + j];
} }
} }
break; break;
case MODE_B_BG: case MODE_B_BG:
for (j = offset; j < 0x20; j += info.mirrorSize) { for (j = offset; j < 0x20; j += info.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
ds->video.vramBBG[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]; ds->video.vramBBG[i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
ds->video.renderer->vramBBG[offset + i + j] = ds->video.vramBBG[offset + i + j]; ds->video.renderer->vramBBG[i + j] = ds->video.vramBBG[i + j];
} }
} }
break; break;
case MODE_A_OBJ: case MODE_A_OBJ:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += info.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
ds->video.vramAOBJ[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]; ds->video.vramAOBJ[i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
ds->video.renderer->vramAOBJ[offset + i + j] = ds->video.vramAOBJ[offset + i + j]; ds->video.renderer->vramAOBJ[i + j] = ds->video.vramAOBJ[i + j];
} }
} }
break; break;
case MODE_B_OBJ: case MODE_B_OBJ:
for (j = offset; j < 0x20; j += oldInfo.mirrorSize) { for (j = offset; j < 0x20; j += info.mirrorSize) {
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
ds->video.vramBOBJ[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]; ds->video.vramBOBJ[i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
ds->video.renderer->vramBOBJ[offset + i + j] = ds->video.vramBOBJ[offset + i + j]; ds->video.renderer->vramBOBJ[i + j] = ds->video.vramBOBJ[i + j];
} }
} }
break; break;