all repos — mgba @ 38116f0ead8b1e0da0c3064c3415cace8eaee167

mGBA Game Boy Advance Emulator

Rearrange calculation to shave off some more time
Jeffrey Pfau jeffrey@endrift.com
Sat, 26 Oct 2013 01:30:31 -0700
commit

38116f0ead8b1e0da0c3064c3415cace8eaee167

parent

71b547356349d5d4d6acf498c369dc7ba3dc27bc

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

jump to
M src/gba/renderers/video-software.c → src/gba/renderers/video-software.c 
@@ -31,8 +31,8 @@ static void _drawBackgroundMode2(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 _drawBackgroundMode5(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y);
-static void _preprocessTransformedSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBATransformedObj* sprite, int y);
-static void _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* 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 void _postprocessSprite(struct GBAVideoSoftwareRenderer* renderer, unsigned priority);
 
 static void _updatePalettes(struct GBAVideoSoftwareRenderer* renderer);

@@ -541,14 +541,15 @@ if (!renderer->currentWindow.objEnable) {
 				continue;
 			}
 			int i;
+			int drawn;
 			for (i = 0; i < 128; ++i) {
 				struct GBAObj* sprite = &renderer->d.oam->obj[i];
 				if (sprite->transformed) {
-					spriteLayers |= 1 << sprite->priority;
-					_preprocessTransformedSprite(renderer, &renderer->d.oam->tobj[i], y);
+					drawn = _preprocessTransformedSprite(renderer, &renderer->d.oam->tobj[i], y);
+					spriteLayers |= drawn << sprite->priority;
 				} else if (!sprite->disable) {
-					spriteLayers |= 1 << sprite->priority;
-					_preprocessSprite(renderer, sprite, y);
+					drawn = _preprocessSprite(renderer, sprite, y);
+					spriteLayers |= drawn << sprite->priority;
 				}
 			}
 		}

@@ -1252,14 +1253,14 @@ if (tileData) { \
 		renderer->row[outX] |= FLAG_OBJWIN; \
 	}
 
-static void _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y) {
-	int width = _objSizes[sprite->shape * 8 + sprite->size * 2];
+static int _preprocessSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBAObj* sprite, int y) {
 	int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1];
-	int start = renderer->start;
-	int end = renderer->end;
 	if ((y < sprite->y && (sprite->y + height - 256 < 0 || y >= sprite->y + height - 256)) || y >= sprite->y + height) {
-		return;
+		return 0;
 	}
+	int width = _objSizes[sprite->shape * 8 + sprite->size * 2];
+	int start = renderer->start;
+	int end = renderer->end;
 	uint32_t flags = (sprite->priority << OFFSET_PRIORITY) | FLAG_FINALIZED;
 	flags |= FLAG_TARGET_1 * ((renderer->currentWindow.blendEnable && renderer->target1Obj && renderer->blendEffect == BLEND_ALPHA) || sprite->mode == OBJ_MODE_SEMITRANSPARENT);
 	flags |= FLAG_TARGET_2 *renderer->target2Obj;

@@ -1291,18 +1292,19 @@ } else {
 			SPRITE_NORMAL_LOOP(256, VARIANT);
 		}
 	}
+	return 1;
 }
 
-static void _preprocessTransformedSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBATransformedObj* sprite, int y) {
+static int _preprocessTransformedSprite(struct GBAVideoSoftwareRenderer* renderer, struct GBATransformedObj* sprite, int y) {
+	int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1];
+	int totalHeight = height << sprite->doublesize;
+	if ((y < sprite->y && (sprite->y + totalHeight - 256 < 0 || y >= sprite->y + totalHeight - 256)) || y >= sprite->y + totalHeight) {
+		return 0;
+	}
 	int width = _objSizes[sprite->shape * 8 + sprite->size * 2];
 	int totalWidth = width << sprite->doublesize;
-	int height = _objSizes[sprite->shape * 8 + sprite->size * 2 + 1];
-	int totalHeight = height << sprite->doublesize;
 	int start = renderer->start;
 	int end = renderer->end;
-	if ((y < sprite->y && (sprite->y + totalHeight - 256 < 0 || y >= sprite->y + totalHeight - 256)) || y >= sprite->y + totalHeight) {
-		return;
-	}
 	uint32_t flags = (sprite->priority << OFFSET_PRIORITY) | FLAG_FINALIZED;
 	flags |= FLAG_TARGET_1 * ((renderer->currentWindow.blendEnable && renderer->target1Obj && renderer->blendEffect == BLEND_ALPHA) || sprite->mode == OBJ_MODE_SEMITRANSPARENT);
 	flags |= FLAG_TARGET_2 * renderer->target2Obj;

@@ -1332,6 +1334,7 @@ } else {
 			SPRITE_TRANSFORMED_LOOP(256, VARIANT);
 		}
 	}
+	return 1;
 }
 
 static void _postprocessSprite(struct GBAVideoSoftwareRenderer* renderer, unsigned priority) {