OpenGL Renderer:

- Wrap OpenGL calls in OGLReset().
2012-12-04 02:27:41 +00:00 · 2012-12-04 02:27:41 +00:00 · e6615d640d
parent c87672f680
commit e6615d640d
1 changed files with 11 additions and 5 deletions
--- 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;
 }