M src/gba/renderers/video-software.c → src/gba/renderers/video-software.c

@@ -259,10 +259,12 @@ case REG_WIN1V:
 		softwareRenderer->win1V.packed = value;
 		break;
 	case REG_WININ:
-		softwareRenderer->winin.packed = value;
+		softwareRenderer->win0.packed = value;
+		softwareRenderer->win1.packed = value >> 8;
 		break;
 	case REG_WINOUT:
 		softwareRenderer->winout.packed = value;
+		softwareRenderer->objwin.packed = value >> 8;
 		break;
 	default:
 		GBALog(GBA_LOG_STUB, "Stub video register write: %03x", address);
@@ -319,10 +321,31 @@ }
 	}
 
 	softwareRenderer->row = row;
+	memset(softwareRenderer->spriteLayer, 0, sizeof(softwareRenderer->spriteLayer));
 
-	softwareRenderer->start = 0;
-	softwareRenderer->end = VIDEO_HORIZONTAL_PIXELS;
-	_drawScanline(softwareRenderer, y);
+	if (softwareRenderer->dispcnt.win0Enable || softwareRenderer->dispcnt.win1Enable) {
+		if (softwareRenderer->dispcnt.win0Enable) {
+			softwareRenderer->currentWindow = softwareRenderer->win0;
+			softwareRenderer->start = softwareRenderer->win0H.start;
+			softwareRenderer->end = softwareRenderer->win0H.end;
+			_drawScanline(softwareRenderer, y);
+		}
+		if (softwareRenderer->dispcnt.win1Enable) {
+			softwareRenderer->currentWindow = softwareRenderer->win1;
+			softwareRenderer->start = softwareRenderer->win1H.start;
+			softwareRenderer->end = softwareRenderer->win1H.end;
+			_drawScanline(softwareRenderer, y);
+		}
+		softwareRenderer->currentWindow = softwareRenderer->winout;
+		softwareRenderer->start = 0;
+		softwareRenderer->end = VIDEO_HORIZONTAL_PIXELS;
+		_drawScanline(softwareRenderer, y);
+	} else {
+		softwareRenderer->currentWindow.packed = 0xFF;
+		softwareRenderer->start = 0;
+		softwareRenderer->end = VIDEO_HORIZONTAL_PIXELS;
+		_drawScanline(softwareRenderer, y);
+	}
 }
 
 static void GBAVideoSoftwareRendererFinishFrame(struct GBAVideoRenderer* renderer) {
@@ -448,10 +471,8 @@ }
 }
 
 static void _drawScanline(struct GBAVideoSoftwareRenderer* renderer, int y) {
-	int i;
-	memset(renderer->spriteLayer, 0, sizeof(renderer->spriteLayer));
-	if (renderer->dispcnt.objEnable) {
-		int j;
+	if (renderer->dispcnt.objEnable && renderer->currentWindow.objEnable) {
+		int i, j;
 		for (j = 0; j < 4; ++j) {
 			uint32_t bitmap = renderer->enabledBitmap[j];
 			if (!bitmap) {
@@ -471,16 +492,18 @@ }
 		}
 	}
 
+	renderer->start = 0;
+	renderer->end = VIDEO_HORIZONTAL_PIXELS;
 	int priority;
 	for (priority = 0; priority < 4; ++priority) {
 		_postprocessSprite(renderer, priority);
-		if (renderer->bg[0].enabled && renderer->bg[0].priority == priority && renderer->dispcnt.mode < 2) {
+		if (renderer->bg[0].enabled && renderer->currentWindow.bg0Enable && renderer->bg[0].priority == priority && renderer->dispcnt.mode < 2) {
 			_drawBackgroundMode0(renderer, &renderer->bg[0], y);
 		}
-		if (renderer->bg[1].enabled && renderer->bg[1].priority == priority && renderer->dispcnt.mode < 2) {
+		if (renderer->bg[1].enabled && renderer->currentWindow.bg1Enable && renderer->bg[1].priority == priority && renderer->dispcnt.mode < 2) {
 			_drawBackgroundMode0(renderer, &renderer->bg[1], y);
 		}
-		if (renderer->bg[2].enabled && renderer->bg[2].priority == priority) {
+		if (renderer->bg[2].enabled && renderer->currentWindow.bg2Enable && renderer->bg[2].priority == priority) {
 			switch (renderer->dispcnt.mode) {
 			case 0:
 				_drawBackgroundMode0(renderer, &renderer->bg[2], y);
@@ -502,7 +525,7 @@ }
 			renderer->bg[2].sx += renderer->bg[2].dmx;
 			renderer->bg[2].sy += renderer->bg[2].dmy;
 		}
-		if (renderer->bg[3].enabled && renderer->bg[3].priority == priority) {
+		if (renderer->bg[3].enabled && renderer->currentWindow.bg3Enable && renderer->bg[3].priority == priority) {
 			switch (renderer->dispcnt.mode) {
 			case 0:
 				_drawBackgroundMode0(renderer, &renderer->bg[3], y);
@@ -719,10 +742,10 @@ flags |= FLAG_TARGET_2 * background->target2;
 
 	uint32_t screenBase;
 	uint32_t charBase;
-	int variant = background->target1 && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
+	int variant = background->target1 && renderer->currentWindow.blendEnable && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
 
 	int outX = 0;
-	int tileX = 0;
+	int tileX = renderer->start >> 3;
 	if (inX & 0x7) {
 		uint32_t tileData;
 		int pixelData, paletteData;
@@ -877,7 +900,7 @@ \
 	int flags = (background->priority << OFFSET_PRIORITY) | FLAG_IS_BACKGROUND; \
 	flags |= FLAG_TARGET_1 * (background->target1 && renderer->blendEffect == BLEND_ALPHA); \
 	flags |= FLAG_TARGET_2 * background->target2; \
-	int variant = background->target1 && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
+	int variant = background->target1 && renderer->currentWindow.blendEnable && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
 
 #define BACKGROUND_BITMAP_ITERATE(W, H) \
 	x += background->dx; \
@@ -1122,7 +1145,7 @@ if (sprite->vflip) {
 		inY = height - inY - 1;
 	}
 	unsigned charBase = BASE_TILE + sprite->tile * 0x20;
-	int variant = renderer->target1Obj && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
+	int variant = renderer->target1Obj && renderer->currentWindow.blendEnable && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
 	if (!sprite->multipalette) {
 		if (!variant) {
 			SPRITE_NORMAL_LOOP(16, NORMAL);
@@ -1154,7 +1177,7 @@ flags |= FLAG_TARGET_2 *renderer->target2Obj;
 	int x = sprite->x;
 	unsigned charBase = BASE_TILE + sprite->tile * 0x20;
 	struct GBAOAMMatrix* mat = &renderer->d.oam->mat[sprite->matIndex];
-	int variant = renderer->target1Obj && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
+	int variant = renderer->target1Obj && renderer->currentWindow.blendEnable && (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN);
 	int inY = y - sprite->y;
 	if (inY < 0) {
 		inY += 256;
@@ -1176,7 +1199,7 @@ }
 
 static void _postprocessSprite(struct GBAVideoSoftwareRenderer* renderer, int priority) {
 	int x;
-	for (x = 0; x < 240; ++x) {
+	for (x = renderer->start; x < renderer->end; ++x) {
 		uint32_t color = renderer->spriteLayer[x];
 		if ((color & FLAG_FINALIZED) && (color & FLAG_PRIORITY) >> OFFSET_PRIORITY == priority && !(renderer->row[x] & FLAG_FINALIZED)) {
 			_composite(renderer, x, color & ~FLAG_FINALIZED);

M src/gba/renderers/video-software.h → src/gba/renderers/video-software.h

@@ -60,22 +60,15 @@ };
 
 union WindowControl {
 	struct {
-		unsigned bg0EnableLo : 1;
-		unsigned bg1EnableLo : 1;
-		unsigned bg2EnableLo : 1;
-		unsigned bg3EnableLo : 1;
-		unsigned objEnableLo : 1;
-		unsigned blendEnableLo : 1;
-		unsigned : 2;
-		unsigned bg0EnableHi : 1;
-		unsigned bg1EnableHi : 1;
-		unsigned bg2EnableHi : 1;
-		unsigned bg3EnableHi : 1;
-		unsigned objEnableHi : 1;
-		unsigned blendEnableHi : 1;
+		unsigned bg0Enable : 1;
+		unsigned bg1Enable : 1;
+		unsigned bg2Enable : 1;
+		unsigned bg3Enable : 1;
+		unsigned objEnable : 1;
+		unsigned blendEnable : 1;
 		unsigned : 2;
 	};
-	uint16_t packed;
+	uint8_t packed;
 };
 
 struct GBAVideoSoftwareRenderer {
@@ -106,8 +99,12 @@ union Window win0V;
 	union Window win1H;
 	union Window win1V;
 
-	union WindowControl winin;
+	union WindowControl win0;
+	union WindowControl win1;
 	union WindowControl winout;
+	union WindowControl objwin;
+
+	union WindowControl currentWindow;
 
 	struct GBAVideoSoftwareBackground bg[4];