Reverting revision 33120, which added vram monitoring. The method used had some problems (especially in the freeing function). I will research an alternative solution and submit it to the tracker.

3 files changed, 1 insertions, 30 deletions

diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index 446ad0c47d5..e708775b184 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -22,8 +22,6 @@
 
 #include "KX_GameObject.h"
 
-#include "GPU_extensions.h"
-
 #define spit(x) std::cout << x << std::endl;
 
 #include "MEM_guardedalloc.h"
@@ -63,8 +61,7 @@ BL_Texture::BL_Texture()
 	mNeedsDeleted(0),
 	mType(0),
 	mUnit(0),
-	mEnvState(0),
-	mTexSize(0)
+	mEnvState(0)
 {
 	// --
 }
@@ -80,9 +77,6 @@ void BL_Texture::DeleteTex()
 		glDeleteTextures(1, (GLuint*)&mTexture);
 		mNeedsDeleted = 0;
 		mOk = 0;
-
-		GPU_texture_vram_subtract(mTexSize);
-		mTexSize = 0;
 	}
 
 	if(mEnvState) {
@@ -171,15 +165,11 @@ void BL_Texture::InitGLTex(unsigned int *pix,int x,int y,bool mipmap)
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGBA, x, y, GL_RGBA, GL_UNSIGNED_BYTE, pix );
-		mTexSize = (x*y*4)+(x*y*4)/3;
-		GPU_texture_vram_add(mTexSize);
 	} 
 	else {
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, pix );
-		mTexSize = x*y*4;
-		GPU_texture_vram_add(mTexSize);
 	}
 
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -200,15 +190,11 @@ void BL_Texture::InitNonPow2Tex(unsigned int *pix,int x,int y,bool mipmap)
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGBA, nx, ny, GL_RGBA, GL_UNSIGNED_BYTE, newPixels );
-		mTexSize = (x*y*4)+(x*y*4)/3;
-		GPU_texture_vram_add(mTexSize);
 	}
 	else {
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 		glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, nx, ny, 0, GL_RGBA, GL_UNSIGNED_BYTE, newPixels );
-		mTexSize = x*y*4;
-		GPU_texture_vram_add(mTexSize);
 	}
 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 	free(newPixels);
diff --git a/source/gameengine/Ketsji/BL_Texture.h b/source/gameengine/Ketsji/BL_Texture.h
index 93204910e54..eb3888b4862 100644
--- a/source/gameengine/Ketsji/BL_Texture.h
+++ b/source/gameengine/Ketsji/BL_Texture.h
@@ -27,7 +27,6 @@ private:
 	int					mUnit;			// Texture unit associated with mTexture
 	unsigned int		mEnvState;		// cache textureEnv
 	static unsigned int	mDisableState;	// speed up disabling calls
-	unsigned int		mTexSize;		// Size of texture in video ram
 
 	void InitNonPow2Tex(unsigned int *p,int x,int y,bool mipmap );
 	void InitGLTex(unsigned int *p,int x,int y,bool mipmap );
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index fc43c03df31..a1c7957dc72 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -75,8 +75,6 @@
 #include "DNA_world_types.h"
 #include "DNA_scene_types.h"
 
-#include "GPU_extensions.h"
-
 // If define: little test for Nzc: guarded drawing. If the canvas is
 // not valid, skip rendering this frame.
 //#define NZC_GUARDED_OUTPUT
@@ -1441,18 +1439,6 @@ void KX_KetsjiEngine::RenderDebugProperties()
 										m_canvas->GetHeight());
 			ycoord += 14;
 		}
-
-		// Put an extra gap in the printed results
-		ycoord += 14;
-
-		/* Print texture vram usage */
-		debugtxt.Format("Texture VRAM: %.2f MB", GPU_texture_vram_usage()/1048576.f);
-		m_rendertools->RenderText2D(RAS_IRenderTools::RAS_TEXT_PADDED,
-										debugtxt.Ptr(),
-										xcoord, ycoord,
-										m_canvas->GetWidth(),
-										m_canvas->GetHeight());
-		ycoord += 14;
 	}
 
 	/* Property display*/