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

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

This reverts commit 318a96bcb7.
This commit is contained in:
Vicki Pfau 2020-06-14 19:46:59 -07:00
parent a0bae17267
commit f0b03d7c90
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -28,7 +28,6 @@ Emulation fixes:
- GBA Video: Add missing parts of 256-color mode 0 mosaic (fixes mgba.io/i/1701) - 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: 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: 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 - GBA Video: Fix sprite/backdrop blending regression
- SM83: Emulate HALT bug - SM83: Emulate HALT bug
Other fixes: Other fixes:

5
src/gba/renderers/gl.c
View File

@ -1418,7 +1418,6 @@ void _drawScanlines(struct GBAVideoGLRenderer* glRenderer, int y) {
GBAVideoGLRendererDrawWindow(glRenderer, y); GBAVideoGLRendererDrawWindow(glRenderer, y);
if (GBARegisterDISPCNTIsObjEnable(glRenderer->dispcnt) && !glRenderer->d.disableOBJ) { 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); glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
glEnable(GL_STENCIL_TEST); glEnable(GL_STENCIL_TEST);
glDepthFunc(GL_LESS); glDepthFunc(GL_LESS);
@ -1429,10 +1428,6 @@ void _drawScanlines(struct GBAVideoGLRenderer* glRenderer, int y) {
} }
GBAVideoGLRendererDrawSprite(glRenderer, &sprite->obj, y, sprite->y); GBAVideoGLRendererDrawSprite(glRenderer, &sprite->obj, y, sprite->y);
spriteCyclesRemaining -= sprite->cycles;
if (spriteCyclesRemaining <= 0) {
break;
}
} }
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_STENCIL_TEST); glDisable(GL_STENCIL_TEST);