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

[<cn...@us...>]

Revision: 681
          http://hgengine.svn.sourceforge.net/hgengine/?rev=681&view=rev
Author:   cnlohr
Date:     2010-03-02 02:00:15 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Temporarily? remove the multitexture stuff that seems to be breaking things.  It does appear as though multitextures works without this.

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

Modified: Mercury2/src/Texture.cpp
===================================================================
--- Mercury2/src/Texture.cpp	2010-02-24 05:40:25 UTC (rev 680)
+++ Mercury2/src/Texture.cpp	2010-03-02 02:00:15 UTC (rev 681)
@@ -203,7 +203,7 @@
 void Texture::Activate(uint32_t textureResource)
 {
 	GLCALL( glActiveTexture( textureResource ) );
-	GLCALL( glClientActiveTextureARB(textureResource) );	//XXX: Note to self, this seems to be causing a crash, look into it.
+//	GLCALL( glClientActiveTextureARB(textureResource) );	//XXX: Note to self, this seems to be causing a crash, look into it.
 	GLCALL( glEnableClientState(GL_TEXTURE_COORD_ARRAY) );
 	GLCALL( glEnable( GL_TEXTURE_2D ) );
 }
@@ -211,7 +211,7 @@
 void Texture::Deactivate(uint32_t textureResource)
 {
 	GLCALL( glActiveTexture( textureResource ) );
-	GLCALL( glClientActiveTextureARB(textureResource) );
+//	GLCALL( glClientActiveTextureARB(textureResource) );
 	GLCALL( glDisableClientState(GL_TEXTURE_COORD_ARRAY) );
 	GLCALL( glDisable( GL_TEXTURE_2D ) );
 	GLERRORCHECK;
@@ -222,7 +222,7 @@
 	for (uint8_t i = 0; i < m_numActiveTextures; ++i)
 	{
 		GLCALL( glActiveTexture( GL_TEXTURE0+i ) );
-		GLCALL( glClientActiveTextureARB(GL_TEXTURE0+i) );	//XXX: Note to self, this seems to be causing a crash, look into it.
+//		GLCALL( glClientActiveTextureARB(GL_TEXTURE0+i) );	//XXX: Note to self, this seems to be causing a crash, look into it.
 		GLCALL( glTexCoordPointer(2, GL_FLOAT, stride, BUFFER_OFFSET(uvByteOffset)) );
 	}
 	


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