From e6615d640d97b6522c963961e9a95393032c0547 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Tue, 4 Dec 2012 02:27:41 +0000
Subject: [PATCH] OpenGL Renderer: - Wrap OpenGL calls in OGLReset().

---
 desmume/src/OGLRender.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp
index 724fdb66b..550bfddf3 100644
--- a/desmume/src/OGLRender.cpp
+++ b/desmume/src/OGLRender.cpp
@@ -352,10 +352,16 @@ static void OGLReset()
 {
 	if(hasShaders)
 	{
-		glUniform1i(hasTexLoc, 0);
 		hasTexture = false;
-		glUniform1i(texBlendLoc, 0);
-		glUniform1i(oglWBuffer, 0);
+		
+		if(BEGINGL())
+		{
+			glUniform1i(hasTexLoc, 0);
+			glUniform1i(texBlendLoc, 0);
+			glUniform1i(oglWBuffer, 0);
+			
+			ENDGL();
+		}
 	}
 
 	TexCache_Reset();
@@ -597,9 +603,9 @@ static char OGLInit(void)
 
 	glActiveTexture(GL_TEXTURE0);
 
-	OGLReset();
-
 	ENDGL();
+	
+	OGLReset();
 
 	return 1;
 }