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

Revert "GBA Video: Fix out-of-order OBJWIN" 

This reverts commit f34f45257a.
This commit is contained in:
Jeffrey Pfau 2016-12-28 19:05:57 -08:00
parent d752df421f
commit 2d02719fa5
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gba/renderers/video-software.c
View File

@ -459,7 +459,6 @@ static void _breakWindowInner(struct GBAVideoSoftwareRenderer* softwareRenderer,
static void _cleanOAM(struct GBAVideoSoftwareRenderer* renderer) {
int i;
int oamMax = 0;
int objwinMax = 0;
for (i = 0; i < 128; ++i) {
struct GBAObj obj;
LOAD_16(obj.a, 0, &renderer->d.oam->obj[i].a);
@ -471,22 +470,14 @@ static void _cleanOAM(struct GBAVideoSoftwareRenderer* renderer) {
height <<= GBAObjAttributesAGetDoubleSize(obj.a);
}
if (GBAObjAttributesAGetY(obj.a) < VIDEO_VERTICAL_PIXELS || GBAObjAttributesAGetY(obj.a) + height >= VIDEO_VERTICAL_TOTAL_PIXELS) {
if (GBAObjAttributesAGetMode(obj.a) == OBJ_MODE_OBJWIN) {
renderer->objwinSprites[objwinMax].y = GBAObjAttributesAGetY(obj.a);
renderer->objwinSprites[objwinMax].endY = GBAObjAttributesAGetY(obj.a) + height;
renderer->objwinSprites[objwinMax].obj = obj;
++objwinMax;
} else {
renderer->sprites[oamMax].y = GBAObjAttributesAGetY(obj.a);
renderer->sprites[oamMax].endY = GBAObjAttributesAGetY(obj.a) + height;
renderer->sprites[oamMax].obj = obj;
++oamMax;
}
renderer->sprites[oamMax].y = GBAObjAttributesAGetY(obj.a);
renderer->sprites[oamMax].endY = GBAObjAttributesAGetY(obj.a) + height;
renderer->sprites[oamMax].obj = obj;
++oamMax;
}
}
}
renderer->oamMax = oamMax;
renderer->objwinMax = objwinMax;
renderer->oamDirty = 0;
}
@ -742,20 +733,7 @@ static void _drawScanline(struct GBAVideoSoftwareRenderer* renderer, int y) {
}
int i;
int drawn;
for (i = 0; i < renderer->objwinMax; ++i) {
int localY = y;
if (renderer->spriteCyclesRemaining <= 0) {
break;
}
struct GBAVideoSoftwareSprite* sprite = &renderer->objwinSprites[i];
if (GBAObjAttributesAIsMosaic(sprite->obj.a)) {
localY = mosaicY;
}
if ((localY < sprite->y && (sprite->endY - 256 < 0 || localY >= sprite->endY - 256)) || localY >= sprite->endY) {
continue;
}
GBAVideoSoftwareRendererPreprocessSprite(renderer, &sprite->obj, localY);
}
for (i = 0; i < renderer->oamMax; ++i) {
int localY = y;
if (renderer->spriteCyclesRemaining <= 0) {

2
src/gba/renderers/video-software.h
View File

@ -154,9 +154,7 @@ struct GBAVideoSoftwareRenderer {
int oamDirty;
int oamMax;
int objwinMax;
struct GBAVideoSoftwareSprite sprites[128];
struct GBAVideoSoftwareSprite objwinSprites[128];
int start;
int end;