From 7f975f56f7ed33c3c1aef122fd52bc0c5bc8e31c Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sun, 14 Jun 2020 19:45:09 -0700 Subject: [PATCH] Revert "GBA Video: Add sprite cycle counting to GL (fixes #1635)" This reverts commit a87cde8e93f7ccf5bcd671f1c94accaa328407e1. --- CHANGES | 1 - src/gba/renderers/gl.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/CHANGES b/CHANGES index 9f14df552..bb4d00bbb 100644 --- a/CHANGES +++ b/CHANGES @@ -14,7 +14,6 @@ Emulation fixes: - GBA Video: Add missing parts of 256-color mode 0 mosaic (fixes mgba.io/i/1701) - GBA Video: Fix double-size OBJ wrapping in GL renderer (fixes mgba.io/i/1712) - GBA Video: Simplify sprite cycle counting (fixes mgba.io/i/1279) - - GBA Video: Add sprite cycle counting to GL (fixes mgba.io/i/1635) - GBA Video: Fix sprite/backdrop blending regression Other fixes: - 3DS: Fix framelimiter on newer citro3d (fixes mgba.io/i/1771) diff --git a/src/gba/renderers/gl.c b/src/gba/renderers/gl.c index bba8aec61..7376b6dc2 100644 --- a/src/gba/renderers/gl.c +++ b/src/gba/renderers/gl.c @@ -1427,7 +1427,6 @@ void _drawScanlines(struct GBAVideoGLRenderer* glRenderer, int y) { GBAVideoGLRendererDrawWindow(glRenderer, y); if (GBARegisterDISPCNTIsObjEnable(glRenderer->dispcnt) && !glRenderer->d.disableOBJ) { int i; - int spriteCyclesRemaining = GBARegisterDISPCNTIsHblankIntervalFree(glRenderer->dispcnt) ? OBJ_HBLANK_FREE_LENGTH : OBJ_LENGTH; glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); glEnable(GL_STENCIL_TEST); glDepthFunc(GL_LESS); @@ -1438,16 +1437,6 @@ void _drawScanlines(struct GBAVideoGLRenderer* glRenderer, int y) { } GBAVideoGLRendererDrawSprite(glRenderer, &sprite->obj, y, sprite->y); - - int cycles = GBAVideoObjSizes[GBAObjAttributesAGetShape(sprite->obj.a) * 4 + GBAObjAttributesBGetSize(sprite->obj.b)][0]; - if (GBAObjAttributesAIsTransformed(sprite->obj.a)) { - cycles <<= GBAObjAttributesAGetDoubleSize(sprite->obj.a) + 1; - cycles += 10; - } - spriteCyclesRemaining -= cycles; - if (spriteCyclesRemaining <= 0) { - break; - } } glDisable(GL_DEPTH_TEST); glDisable(GL_STENCIL_TEST);