From 3db1413334da462dba2dcf2537e1334e28699201 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 15 Jul 2008 00:39:08 +0000 Subject: [PATCH] use PANDA_ALLOC_ARRAY etc --- panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx | 6 +++--- panda/src/tinydisplay/tinyTextureContext.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx b/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx index 918da8b41e..e475f606c3 100644 --- a/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx +++ b/panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx @@ -1273,7 +1273,7 @@ release_texture(TextureContext *tc) { if (gltex->allocated_buffer != NULL) { nassertv(gltex->num_levels != 0); TinyTextureContext::get_class_type().dec_memory_usage(TypeHandle::MC_array, gltex->total_bytecount); - gl_free(gltex->allocated_buffer); + PANDA_FREE_ARRAY(gltex->allocated_buffer); gltex->allocated_buffer = NULL; gltex->total_bytecount = 0; gltex->num_levels = 0; @@ -1892,10 +1892,10 @@ setup_gltex(GLTexture *gltex, int x_size, int y_size, int num_levels) { if (gltex->total_bytecount != total_bytecount) { if (gltex->allocated_buffer != NULL) { - gl_free(gltex->allocated_buffer); + PANDA_FREE_ARRAY(gltex->allocated_buffer); TinyTextureContext::get_class_type().dec_memory_usage(TypeHandle::MC_array, gltex->total_bytecount); } - gltex->allocated_buffer = (void *)gl_malloc(total_bytecount); + gltex->allocated_buffer = PANDA_MALLOC_ARRAY(total_bytecount); gltex->total_bytecount = total_bytecount; TinyTextureContext::get_class_type().inc_memory_usage(TypeHandle::MC_array, total_bytecount); } diff --git a/panda/src/tinydisplay/tinyTextureContext.cxx b/panda/src/tinydisplay/tinyTextureContext.cxx index 926be3a5cc..44c726b640 100644 --- a/panda/src/tinydisplay/tinyTextureContext.cxx +++ b/panda/src/tinydisplay/tinyTextureContext.cxx @@ -40,7 +40,7 @@ evict_lru() { if (gltex->allocated_buffer != NULL) { nassertv(gltex->num_levels != 0); TinyTextureContext::get_class_type().dec_memory_usage(TypeHandle::MC_array, gltex->total_bytecount); - gl_free(gltex->allocated_buffer); + PANDA_FREE_ARRAY(gltex->allocated_buffer); gltex->allocated_buffer = NULL; gltex->total_bytecount = 0; gltex->num_levels = 0;