From ef9e8d05c4dfa4119bdb3f5db0966fda0401f6ee Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Tue, 3 Jul 2012 18:20:32 +0900
Subject: [PATCH] Avoid some unnecessary state changes.

Doesn't make much difference but it doesn't hurt.
---
 libs/video/renderer/glsl/glsl_main.c      | 46 ++++++++++-------------
 libs/video/renderer/glsl/glsl_particles.c |  2 +-
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/libs/video/renderer/glsl/glsl_main.c b/libs/video/renderer/glsl/glsl_main.c
index ca95f538f..b55f8ad0c 100644
--- a/libs/video/renderer/glsl/glsl_main.c
+++ b/libs/video/renderer/glsl/glsl_main.c
@@ -151,36 +151,30 @@ static void
 R_RenderEntities (void)
 {
 	entity_t   *ent;
+	int         begun;
 
 	if (!r_drawentities->int_val)
 		return;
+#define RE_LOOP(type_name, Type) \
+	do { \
+		begun = 0; \
+		for (ent = r_ent_queue; ent; ent = ent->next) { \
+			if (ent->model->type != mod_##type_name) \
+				continue; \
+			if (!begun) { \
+				glsl_R_##Type##Begin (); \
+				begun = 1; \
+			} \
+			currententity = ent; \
+			glsl_R_Draw##Type (); \
+		} \
+		if (begun) \
+			glsl_R_##Type##End (); \
+	} while (0)
 
-	glsl_R_AliasBegin ();
-	for (ent = r_ent_queue; ent; ent = ent->next) {
-		if (ent->model->type != mod_alias)
-			continue;
-		currententity = ent;
-		glsl_R_DrawAlias ();
-	}
-	glsl_R_AliasEnd ();
-
-	glsl_R_IQMBegin ();
-	for (ent = r_ent_queue; ent; ent = ent->next) {
-		if (ent->model->type != mod_iqm)
-			continue;
-		currententity = ent;
-		glsl_R_DrawIQM ();
-	}
-	glsl_R_IQMEnd ();
-
-	glsl_R_SpriteBegin ();
-	for (ent = r_ent_queue; ent; ent = ent->next) {
-		if (ent->model->type != mod_sprite)
-			continue;
-		currententity = ent;
-		glsl_R_DrawSprite ();
-	}
-	glsl_R_SpriteEnd ();
+	RE_LOOP (alias, Alias);
+	RE_LOOP (iqm, IQM);
+	RE_LOOP (sprite, Sprite);
 }
 
 static void
diff --git a/libs/video/renderer/glsl/glsl_particles.c b/libs/video/renderer/glsl/glsl_particles.c
index 51daebccf..2934c571a 100644
--- a/libs/video/renderer/glsl/glsl_particles.c
+++ b/libs/video/renderer/glsl/glsl_particles.c
@@ -1763,7 +1763,7 @@ draw_id_particles (void)
 void
 glsl_R_DrawParticles (void)
 {
-	if (!r_particles->int_val)
+	if (!r_particles->int_val || !numparticles)
 		return;
 	if (r_particles_style->int_val) {
 		draw_qf_particles ();