diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2010-11-24 09:27:07 +0300 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2010-11-24 09:27:07 +0300 |
commit | 32eba0898b8df5ed40db38e6b41884190e8e45e0 (patch) | |
tree | 94afd204e0084514bbdf996700cc542513237f5f /source/gameengine/Ketsji/BL_Texture.cpp | |
parent | c790b2c238691b5688866244f2372535e51061a1 (diff) |
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.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Texture.cpp')
-rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 16 |
1 files changed, 1 insertions, 15 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); |