Revert "GBA Video: Add sprite cycle counting to GL (fixes #1635)" This reverts commit a87cde8e93f7ccf5bcd671f1c94accaa328407e1.
Vicki Pfau vi@endrift.com
Sun, 14 Jun 2020 19:45:09 -0700
2 files changed,
0 insertions(+),
12 deletions(-)
M
CHANGES
→
CHANGES
@@ -14,7 +14,6 @@ - GBA Video: Fix disabling OBJWIN in GL renderer (fixes mgba.io/i/1759)
- 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)
M
src/gba/renderers/gl.c
→
src/gba/renderers/gl.c
@@ -1427,7 +1427,6 @@
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 @@ continue;
} 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);