From f0b03d7c901a8687db97ae88f2911e117e623f3c Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sun, 14 Jun 2020 19:46:59 -0700
Subject: [PATCH] Revert "GBA Video: Add sprite cycle counting to GL (fixes
 #1635)"

This reverts commit 318a96bcb78da0f178fb87aacd78ef86521e4bb2.
---
 CHANGES                | 1 -
 src/gba/renderers/gl.c | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index f1375dd48..2d106f764 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,7 +28,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
  - SM83: Emulate HALT bug
 Other fixes:
diff --git a/src/gba/renderers/gl.c b/src/gba/renderers/gl.c
index 311ae9c8c..b75d91b2d 100644
--- a/src/gba/renderers/gl.c
+++ b/src/gba/renderers/gl.c
@@ -1418,7 +1418,6 @@ void _drawScanlines(struct GBAVideoGLRenderer* glRenderer, int y) {
 
 	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 @@ void _drawScanlines(struct GBAVideoGLRenderer* glRenderer, int y) {
 			}
 
 			GBAVideoGLRendererDrawSprite(glRenderer, &sprite->obj, y, sprite->y);
-			spriteCyclesRemaining -= sprite->cycles;
-			if (spriteCyclesRemaining <= 0) {
-				break;
-			}
 		}
 		glDisable(GL_DEPTH_TEST);
 		glDisable(GL_STENCIL_TEST);