all repos — mgba @ f0b03d7c901a8687db97ae88f2911e117e623f3c

mGBA Game Boy Advance Emulator

Revert "GBA Video: Add sprite cycle counting to GL (fixes #1635)"

This reverts commit 318a96bcb78da0f178fb87aacd78ef86521e4bb2.
Vicki Pfau vi@endrift.com
Sun, 14 Jun 2020 19:46:59 -0700
commit

f0b03d7c901a8687db97ae88f2911e117e623f3c

parent

a0bae17267c5bb0b6c4406cedcd8da0249af28e5

2 files changed, 0 insertions(+), 6 deletions(-)

jump to
M CHANGESCHANGES

@@ -28,7 +28,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 - SM83: Emulate HALT bug Other fixes:
M src/gba/renderers/gl.csrc/gba/renderers/gl.c

@@ -1418,7 +1418,6 @@ glDrawBuffers(1, (GLenum[]) { GL_COLOR_ATTACHMENT0 });

GBAVideoGLRendererDrawWindow(glRenderer, y); if (GBARegisterDISPCNTIsObjEnable(glRenderer->dispcnt) && !glRenderer->d.disableOBJ) { - 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);

@@ -1429,10 +1428,6 @@ continue;

} GBAVideoGLRendererDrawSprite(glRenderer, &sprite->obj, y, sprite->y); - spriteCyclesRemaining -= sprite->cycles; - if (spriteCyclesRemaining <= 0) { - break; - } } glDisable(GL_DEPTH_TEST); glDisable(GL_STENCIL_TEST);