[Hgengine-cvs] SF.net SVN: hgengine:[519] Mercury2/src/Texture.cpp

[<axl...@us...>]

Revision: 519
          http://hgengine.svn.sourceforge.net/hgengine/?rev=519&view=rev
Author:   axlecrusher
Date:     2009-08-23 12:12:13 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
disable texture bind cache

Modified Paths:
--------------
    Mercury2/src/Texture.cpp

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2009-08-23 06:04:16 UTC (rev 518)
+++ Mercury2/src/Texture.cpp	2009-08-23 12:12:13 UTC (rev 519)
@@ -118,7 +118,7 @@
 	
 	m_textureResource = GL_TEXTURE0+m_numActiveTextures;
 	
-	if (m_lastBound[m_numActiveTextures] != this)
+//	if (m_lastBound[m_numActiveTextures] != this)
 	{
 //		We don't really even have to disable old spots
 //		if ( m_lastBound[m_numActiveTextures] != NULL)
@@ -156,6 +156,8 @@
 	GLERRORCHECK;
 	*/
 	
+	Deactivate();
+	
 	Shader::RemoveAttribute( ssprintf("HG_Texture%d", m_numActiveTextures) );
 	m_activeTextures.pop_back();
 	
@@ -188,7 +190,7 @@
 		GLCALL( glTexCoordPointer(2, GL_FLOAT, stride, BUFFER_OFFSET(sizeof(float)*0)) );
 	}
 	
-	Texture::DisableUnusedTextures();
+//	Texture::DisableUnusedTextures();
 }
 
 void Texture::DisableUnusedTextures()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.