diff options
Diffstat (limited to 'source/blender/gpu/intern/gpu_extensions.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 7f44d21f2b1..b3415efc447 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -66,12 +66,11 @@ static struct GPUGlobal { GLuint currentfb; int glslsupport; int extdisabled; - unsigned int texturevram; // An approximation of how much vram is being used for textures int colordepth; GPUDeviceType device; GPUOSType os; GPUDriverType driver; -} GG = {1, 0, 0, 0, 0}; +} GG = {1, 0, 0, 0}; /* GPU Types */ @@ -186,21 +185,6 @@ int GPU_color_depth() return GG.colordepth; } -unsigned int GPU_texture_vram_usage() -{ - return GG.texturevram; -} - -void GPU_texture_vram_add(unsigned int amount) -{ - GG.texturevram += amount; -} - -void GPU_texture_vram_subtract(unsigned int amount) -{ - GG.texturevram -= amount; -} - int GPU_print_error(char *str) { GLenum errCode; @@ -359,8 +343,6 @@ static GPUTexture *GPU_texture_create_nD(int w, int h, int n, float *fpixels, in if (tex->target == GL_TEXTURE_1D) { glTexImage1D(tex->target, 0, internalformat, tex->w, 0, format, type, 0); - GPU_texture_vram_add(tex->w*4); - if (fpixels) { glTexSubImage1D(tex->target, 0, 0, w, format, type, pixels? pixels: fpixels); @@ -374,8 +356,6 @@ static GPUTexture *GPU_texture_create_nD(int w, int h, int n, float *fpixels, in glTexImage2D(tex->target, 0, internalformat, tex->w, tex->h, 0, format, type, 0); - GPU_texture_vram_add(tex->w*tex->h*4); - if (fpixels) { glTexSubImage2D(tex->target, 0, 0, 0, w, h, format, type, pixels? pixels: fpixels); @@ -640,15 +620,8 @@ void GPU_texture_free(GPUTexture *tex) if (tex->fb) GPU_framebuffer_texture_detach(tex->fb, tex); if (tex->bindcode && !tex->fromblender) - { glDeleteTextures(1, &tex->bindcode); - if (tex->target == GL_TEXTURE_2D) - GPU_texture_vram_subtract(tex->w*tex->h*4); - else - GPU_texture_vram_subtract(tex->w*4); - } - MEM_freeN(tex); } } |