all repos — mgba @ eafcb0f5554ee6c21c0fb1ac73219ed6a2c99e1b

mGBA Game Boy Advance Emulator

DS GX: Fix trying to load unmapped texture memory
Vicki Pfau vi@endrift.com
Thu, 16 Mar 2017 00:19:40 -0700
commit

eafcb0f5554ee6c21c0fb1ac73219ed6a2c99e1b

parent

10ed2ed418542aa5bf06d7bdd39784a0ea43e121

1 files changed, 20 insertions(+), 12 deletions(-)

jump to
M src/ds/gx/software.c → src/ds/gx/software.c 
@@ -90,6 +90,9 @@ return c;
 }
 
 static color_t _lookupColor(struct DSGXSoftwareRenderer* renderer, struct DSGXSoftwareEndpoint* ep, struct DSGXSoftwarePolygon* poly) {
+	if (!poly->texBase) {
+		return 0;
+	}
 	// TODO: Optimize
 	uint16_t texel;
 

@@ -436,20 +439,25 @@ poly->texFormat = DSGXTexParamsGetFormat(poly->poly->texParams);
 		poly->blendFormat = DSGXPolygonAttrsGetMode(poly->poly->polyParams);
 		poly->texW = 8 << DSGXTexParamsGetSSize(poly->poly->texParams);
 		poly->texH = 8 << DSGXTexParamsGetTSize(poly->poly->texParams);
-		switch (poly->texFormat) {
-		case 0:
-		case 7:
+		if (!renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET]) {
 			poly->texBase = NULL;
 			poly->palBase = NULL;
-			break;
-		case 2:
-			poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF];
-			poly->palBase = &renderer->texPal[poly->poly->palBase >> 11][(poly->poly->palBase << 2) & 0x1FFF];
-			break;
-		default:
-			poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF];
-			poly->palBase = &renderer->texPal[poly->poly->palBase >> 10][(poly->poly->palBase << 3) & 0x1FFF];
-			break;
+		} else {
+			switch (poly->texFormat) {
+			case 0:
+			case 7:
+				poly->texBase = NULL;
+				poly->palBase = NULL;
+				break;
+			case 2:
+				poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF];
+				poly->palBase = &renderer->texPal[poly->poly->palBase >> 11][(poly->poly->palBase << 2) & 0x1FFF];
+				break;
+			default:
+				poly->texBase = &renderer->tex[DSGXTexParamsGetVRAMBase(poly->poly->texParams) >> VRAM_BLOCK_OFFSET][(DSGXTexParamsGetVRAMBase(poly->poly->texParams) << 2) & 0xFFFF];
+				poly->palBase = &renderer->texPal[poly->poly->palBase >> 10][(poly->poly->palBase << 3) & 0x1FFF];
+				break;
+			}
 		}
 		edge->polyId = i;