git rekt — mgba.git: 29303401780008a36ba5590cb5df6544e0313142

DS Video: Fix VRAM mirroring in the renderer (fixes #561)

Vicki Pfau vi@endrift.com

Sun, 09 Apr 2017 20:48:41 -0700

commit

29303401780008a36ba5590cb5df6544e0313142

parent

b65cc6d97dc8594894ae073c9cb3c07530c0dfe3

2 files changed, 46 insertions(+), 28 deletions(-)

jump to

CHANGES

src/ds/video.c

M CHANGES → CHANGES

@@ -1,4 +1,6 @@
 medusa alpha 2: (Future)
+Bugfixes:
+ - DS Video: Fix VRAM mirroring in the renderer (fixes mgba.io/i/561)
 Misc:
  - DS: Set boot complete bit in RAM on boot (fixes mgba.io/i/576, mgba.io/i/580, mgba.io/i/586)

M src/ds/video.c → src/ds/video.c

@@ -425,34 +425,42 @@ struct DSVRAMBankInfo oldInfo = _vramInfo[index][oldValue & 0x7];
 	uint32_t offset = oldInfo.base + oldInfo.offset[(oldValue >> 3) & 3];
 	switch (oldInfo.mode) {
 	case MODE_A_BG:
-		for (i = 0; i < size; ++i) {
-			if (ds->video.vramABG[offset + i] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
-				ds->video.vramABG[offset + i] = NULL;
-				ds->video.renderer->vramABG[offset + i] = NULL;
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				if (ds->video.vramABG[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
+					ds->video.vramABG[offset + i + j] = NULL;
+					ds->video.renderer->vramABG[offset + i + j] = NULL;
+				}
 			}
 		}
 		break;
 	case MODE_B_BG:
-		for (i = 0; i < size; ++i) {
-			if (ds->video.vramBBG[offset + i] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
-				ds->video.vramBBG[offset + i] = NULL;
-				ds->video.renderer->vramBBG[offset + i] = NULL;
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				if (ds->video.vramBBG[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
+					ds->video.vramBBG[offset + i + j] = NULL;
+					ds->video.renderer->vramBBG[offset + i + j] = NULL;
+				}
 			}
 		}
 		break;
 	case MODE_A_OBJ:
-		for (i = 0; i < size; ++i) {
-			if (ds->video.vramAOBJ[offset + i] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
-				ds->video.vramAOBJ[offset + i] = NULL;
-				ds->video.renderer->vramAOBJ[offset + i] = NULL;
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				if (ds->video.vramAOBJ[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
+					ds->video.vramAOBJ[offset + i + j] = NULL;
+					ds->video.renderer->vramAOBJ[offset + i + j] = NULL;
+				}
 			}
 		}
 		break;
 	case MODE_B_OBJ:
-		for (i = 0; i < size; ++i) {
-			if (ds->video.vramBOBJ[offset + i] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
-				ds->video.vramBOBJ[offset + i] = NULL;
-				ds->video.renderer->vramBOBJ[offset + i] = NULL;
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				if (ds->video.vramBOBJ[offset + i + j] == &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)]) {
+					ds->video.vramBOBJ[offset + i + j] = NULL;
+					ds->video.renderer->vramBOBJ[offset + i + j] = NULL;
+				}
 			}
 		}
 		break;
@@ -529,27 +537,35 @@ }
 	}
 	switch (info.mode) {
 	case MODE_A_BG:
-		for (i = 0; i < size; ++i) {
-			ds->video.vramABG[offset + i] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
-			ds->video.renderer->vramABG[offset + i] = ds->video.vramABG[offset + i];
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				ds->video.vramABG[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
+				ds->video.renderer->vramABG[offset + i + j] = ds->video.vramABG[offset + i + j];
+			}
 		}
 		break;
 	case MODE_B_BG:
-		for (i = 0; i < size; ++i) {
-			ds->video.vramBBG[offset + i] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
-			ds->video.renderer->vramBBG[offset + i] = ds->video.vramBBG[offset + i];
+		for (j = offset; j < 0x20; j += info.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				ds->video.vramBBG[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
+				ds->video.renderer->vramBBG[offset + i + j] = ds->video.vramBBG[offset + i + j];
+			}
 		}
 		break;
 	case MODE_A_OBJ:
-		for (i = 0; i < size; ++i) {
-			ds->video.vramAOBJ[offset + i] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
-			ds->video.renderer->vramAOBJ[offset + i] = ds->video.vramAOBJ[offset + i];
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				ds->video.vramAOBJ[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
+				ds->video.renderer->vramAOBJ[offset + i + j] = ds->video.vramAOBJ[offset + i + j];
+			}
 		}
 		break;
 	case MODE_B_OBJ:
-		for (i = 0; i < size; ++i) {
-			ds->video.vramBOBJ[offset + i] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
-			ds->video.renderer->vramBOBJ[offset + i] = ds->video.vramBOBJ[offset + i];
+		for (j = offset; j < 0x20; j += oldInfo.mirrorSize) {
+			for (i = 0; i < size; ++i) {
+				ds->video.vramBOBJ[offset + i + j] = &memory->vramBank[index][i << (DS_VRAM_OFFSET - 1)];
+				ds->video.renderer->vramBOBJ[offset + i + j] = ds->video.vramBOBJ[offset + i + j];
+			}
 		}
 		break;
 	case MODE_A_BG_EXT_PAL:

all repos — mgba @ 29303401780008a36ba5590cb5df6544e0313142

mGBA Game Boy Advance Emulator