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

GBA Video: Optimize sprite drawing

This commit is contained in:
Jeffrey Pfau 2016-08-11 03:03:49 -07:00
parent 23dbd1e508
commit 7401371016
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -50,6 +50,7 @@ Misc:
- PSP2: Add rumble for PS TV - PSP2: Add rumble for PS TV
- PSP2: Add fit-to-height screen mode - PSP2: Add fit-to-height screen mode
- GBA Video: Remove old slow path fallback - GBA Video: Remove old slow path fallback
- GBA Video: Optimize sprite drawing
0.4.1: (2016-07-11) 0.4.1: (2016-07-11)
Bugfixes: Bugfixes:

5
src/gba/renderers/software-bg.c
View File

@ -14,10 +14,9 @@
#define MODE_2_COORD_NO_OVERFLOW \ #define MODE_2_COORD_NO_OVERFLOW \
if ((x | y) & ~(sizeAdjusted - 1)) { \ if ((x | y) & ~(sizeAdjusted - 1)) { \
continue; \ continue; \
} else { \ } \
localX = x; \ localX = x; \
localY = y; \ localY = y;
}
#define MODE_2_MOSAIC(COORD) \ #define MODE_2_MOSAIC(COORD) \
if (!mosaicWait) { \ if (!mosaicWait) { \

40
src/gba/renderers/software-obj.c
View File

@ -56,7 +56,7 @@
int localY = (yAccum >> 8) + (height >> 1); \ int localY = (yAccum >> 8) + (height >> 1); \
\ \
if (localX & widthMask || localY & heightMask) { \ if (localX & widthMask || localY & heightMask) { \
continue; \ break; \
} \ } \
\ \
SPRITE_YBASE_ ## DEPTH(localY); \ SPRITE_YBASE_ ## DEPTH(localY); \
@ -204,6 +204,38 @@ int GBAVideoSoftwareRendererPreprocessSprite(struct GBAVideoSoftwareRenderer* re
condition = end; condition = end;
} }
// Clip off early pixels
if ((xAccum >> 8) < -(width >> 1)) {
int32_t diffX = -(width << 7) - xAccum;
int32_t x = mat.a ? diffX / mat.a : 0;
xAccum += mat.a * x;
yAccum += mat.c * x;
outX += x;
inX += x;
} else if ((xAccum >> 8) >= (width >> 1)) {
int32_t diffX = (width << 7) - xAccum;
int32_t x = mat.a ? diffX / mat.a : 0;
xAccum += mat.a * x;
yAccum += mat.c * x;
outX += x;
inX += x;
}
if ((yAccum >> 8) < -(height >> 1)) {
int32_t diffY = -(height << 7) - yAccum;
int32_t y = mat.c ? diffY / mat.c : 0;
xAccum += mat.a * y;
yAccum += mat.c * y;
outX += y;
inX += y;
} else if ((yAccum >> 8) >= (height >> 1)) {
int32_t diffY = (height << 7) - yAccum;
int32_t y = mat.c ? diffY / mat.c : 0;
xAccum += mat.a * y;
yAccum += mat.c * y;
outX += y;
inX += y;
}
if (!GBAObjAttributesAIs256Color(sprite->a)) { if (!GBAObjAttributesAIs256Color(sprite->a)) {
palette = &palette[GBAObjAttributesCGetPalette(sprite->c) << 4]; palette = &palette[GBAObjAttributesCGetPalette(sprite->c) << 4];
if (flags & FLAG_OBJWIN) { if (flags & FLAG_OBJWIN) {
@ -230,7 +262,7 @@ int GBAVideoSoftwareRendererPreprocessSprite(struct GBAVideoSoftwareRenderer* re
int outX = x >= start ? x : start; int outX = x >= start ? x : start;
int condition = x + width; int condition = x + width;
int mosaicH = 1; int mosaicH = 1;
if (GBAObjAttributesAIsMosaic(sprite->a)) { if (mosaicH > 1) {
mosaicH = GBAMosaicControlGetObjH(renderer->mosaic) + 1; mosaicH = GBAMosaicControlGetObjH(renderer->mosaic) + 1;
if (condition % mosaicH) { if (condition % mosaicH) {
condition += mosaicH - (condition % mosaicH); condition += mosaicH - (condition % mosaicH);
@ -255,7 +287,7 @@ int GBAVideoSoftwareRendererPreprocessSprite(struct GBAVideoSoftwareRenderer* re
palette = &palette[GBAObjAttributesCGetPalette(sprite->c) << 4]; palette = &palette[GBAObjAttributesCGetPalette(sprite->c) << 4];
if (flags & FLAG_OBJWIN) { if (flags & FLAG_OBJWIN) {
SPRITE_NORMAL_LOOP(16, OBJWIN); SPRITE_NORMAL_LOOP(16, OBJWIN);
} else if (GBAObjAttributesAIsMosaic(sprite->a)) { } else if (mosaicH > 1) {
if (objwinSlowPath) { if (objwinSlowPath) {
objwinPalette = &objwinPalette[GBAObjAttributesCGetPalette(sprite->c) << 4]; objwinPalette = &objwinPalette[GBAObjAttributesCGetPalette(sprite->c) << 4];
SPRITE_MOSAIC_LOOP(16, NORMAL_OBJWIN); SPRITE_MOSAIC_LOOP(16, NORMAL_OBJWIN);
@ -271,7 +303,7 @@ int GBAVideoSoftwareRendererPreprocessSprite(struct GBAVideoSoftwareRenderer* re
} else { } else {
if (flags & FLAG_OBJWIN) { if (flags & FLAG_OBJWIN) {
SPRITE_NORMAL_LOOP(256, OBJWIN); SPRITE_NORMAL_LOOP(256, OBJWIN);
} else if (GBAObjAttributesAIsMosaic(sprite->a)) { } else if (mosaicH > 1) {
if (objwinSlowPath) { if (objwinSlowPath) {
objwinPalette = &objwinPalette[GBAObjAttributesCGetPalette(sprite->c) << 4]; objwinPalette = &objwinPalette[GBAObjAttributesCGetPalette(sprite->c) << 4];
SPRITE_MOSAIC_LOOP(256, NORMAL_OBJWIN); SPRITE_MOSAIC_LOOP(256, NORMAL_OBJWIN);