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

Basic OAM dirtying

This commit is contained in:
Jeffrey Pfau 2014-01-21 22:34:42 -08:00
parent 2553b96e9b
commit 04c3b61d1c
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ static void _drawBackgroundMode2(struct GBAVideoSoftwareRenderer* renderer, stru
static void _drawBackgroundMode3(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y); static void _drawBackgroundMode3(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y);
static void _drawBackgroundMode4(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y); static void _drawBackgroundMode4(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y);
static void _drawBackgroundMode5(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y); static void _drawBackgroundMode5(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y);
static void _cleanOAM(struct GBAVideoSoftwareRenderer* renderer);
static int _preprocessTransformedSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBATransformedObj* sprite, int y); static int _preprocessTransformedSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBATransformedObj* sprite, int y);
static int _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y); static int _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y);
static void _postprocessSprite(struct GBAVideoSoftwareRenderer* renderer, unsigned priority); static void _postprocessSprite(struct GBAVideoSoftwareRenderer* renderer, unsigned priority);
@ -274,6 +275,7 @@ static uint16_t GBAVideoSoftwareRendererWriteVideoRegister(struct GBAVideoRender
static void GBAVideoSoftwareRendererWriteOAM(struct GBAVideoRenderer* renderer, uint32_t oam) { static void GBAVideoSoftwareRendererWriteOAM(struct GBAVideoRenderer* renderer, uint32_t oam) {
struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer; struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer;
softwareRenderer->oamDirty = 1;
} }
static void GBAVideoSoftwareRendererWritePalette(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value) { static void GBAVideoSoftwareRendererWritePalette(struct GBAVideoRenderer* renderer, uint32_t address, uint16_t value) {
@ -343,6 +345,21 @@ static void _breakWindow(struct GBAVideoSoftwareRenderer* softwareRenderer, stru
} }
} }
static void _cleanOAM(struct GBAVideoSoftwareRenderer* renderer) {
int i;
int oamMax = 0;
for (i = 0; i < 128; ++i) {
struct GBAObj* obj = &renderer->d.oam->obj[i];
if (obj->transformed || !obj->disable) {
renderer->sprites[oamMax].obj = *obj;
++oamMax;
}
}
renderer->oamMax = oamMax;
renderer->oamDirty = 0;
}
static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* renderer, int y) { static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* renderer, int y) {
struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer; struct GBAVideoSoftwareRenderer* softwareRenderer = (struct GBAVideoSoftwareRenderer*) renderer;
@ -550,6 +567,9 @@ static void _drawScanline(struct GBAVideoSoftwareRenderer* renderer, int y) {
renderer->end = 0; renderer->end = 0;
int spriteLayers = 0; int spriteLayers = 0;
if (renderer->dispcnt.objEnable) { if (renderer->dispcnt.objEnable) {
if (renderer->oamDirty) {
_cleanOAM(renderer);
}
for (w = 0; w < renderer->nWindows; ++w) { for (w = 0; w < renderer->nWindows; ++w) {
renderer->start = renderer->end; renderer->start = renderer->end;
renderer->end = renderer->windows[w].endX; renderer->end = renderer->windows[w].endX;
@ -559,15 +579,14 @@ static void _drawScanline(struct GBAVideoSoftwareRenderer* renderer, int y) {
} }
int i; int i;
int drawn; int drawn;
for (i = 0; i < 128; ++i) { for (i = 0; i < renderer->oamMax; ++i) {
struct GBAObj* sprite = &renderer->d.oam->obj[i]; struct GBAVideoSoftwareSprite* sprite = &renderer->sprites[i];
if (sprite->transformed) { if (sprite->obj.transformed) {
drawn = _preprocessTransformedSprite(renderer, &renderer->d.oam->tobj[i], y); drawn = _preprocessTransformedSprite(renderer, &sprite->tobj, y);
spriteLayers |= drawn << sprite->priority; } else {
} else if (!sprite->disable) { drawn = _preprocessSprite(renderer, &sprite->obj, y);
drawn = _preprocessSprite(renderer, sprite, y);
spriteLayers |= drawn << sprite->priority;
} }
spriteLayers |= drawn << sprite->obj.priority;
} }
} }
} }

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

@ -11,6 +11,13 @@ typedef uint16_t color_t;
typedef uint32_t color_t; typedef uint32_t color_t;
#endif #endif
struct GBAVideoSoftwareSprite {
union {
struct GBAObj obj;
struct GBATransformedObj tobj;
};
};
struct GBAVideoSoftwareBackground { struct GBAVideoSoftwareBackground {
int index; int index;
int enabled; int enabled;
@ -150,6 +157,10 @@ struct GBAVideoSoftwareRenderer {
struct GBAVideoSoftwareBackground bg[4]; struct GBAVideoSoftwareBackground bg[4];
int oamDirty;
int oamMax;
struct GBAVideoSoftwareSprite sprites[128];
int start; int start;
int end; int end;
}; };