Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Take care memory leak

This commit is contained in:
halx99 2021-07-02 14:32:22 +08:00
parent be7c037cd9
commit e2c213e0bd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/base/astc.cpp
View File

@ -23,7 +23,7 @@
#include "yasio/detail/utils.hpp" #include "yasio/detail/utils.hpp"
#define ASTCDEC_NO_CONTEXT 1 #define ASTCDEC_NO_CONTEXT 1
#define ASTCDEC_PRINT_BENCHMARK 0 #define ASTCDEC_PRINT_BENCHMARK 1
typedef std::mutex astc_decompress_mutex_t; typedef std::mutex astc_decompress_mutex_t;
@ -32,7 +32,9 @@ struct astc_decompress_task {
unsigned int dim_x, unsigned int dim_y, int block_x, int block_y); unsigned int dim_x, unsigned int dim_y, int block_x, int block_y);
astc_decompress_task() {} astc_decompress_task() {}
~astc_decompress_task() { ~astc_decompress_task() {
#if !ASTCDEC_NO_CONTEXT #if ASTCDEC_NO_CONTEXT
term_block_size_descriptor(_bsd);
#else
if (_context) if (_context)
astcenc_context_free(this->_context); astcenc_context_free(this->_context);
#endif #endif
@ -113,8 +115,8 @@ public:
} }
private: private:
std::shared_ptr<astc_decompress_task> make_task(const uint8_t* in, unsigned int inlen, std::shared_ptr<astc_decompress_task> make_task(const uint8_t* in, unsigned int inlen, uint8_t* out,
uint8_t* out, unsigned int dim_x, unsigned int dim_y, int block_x, int block_y) { unsigned int dim_x, unsigned int dim_y, int block_x, int block_y) {
unsigned int xblocks = (dim_x + block_x - 1) / block_x; unsigned int xblocks = (dim_x + block_x - 1) / block_x;
unsigned int yblocks = (dim_y + block_y - 1) / block_y; unsigned int yblocks = (dim_y + block_y - 1) / block_y;
unsigned int zblocks = 1; // (dim_z + block_z - 1) / block_z; unsigned int zblocks = 1; // (dim_z + block_z - 1) / block_z;
@ -143,7 +145,7 @@ private:
#else #else
(void) astcenc_config_init( (void) astcenc_config_init(
ASTCENC_PRF_LDR, block_x, block_y, 1, 0, ASTCENC_FLG_DECOMPRESS_ONLY, &task->_config); ASTCENC_PRF_LDR, block_x, block_y, 1, 0, ASTCENC_FLG_DECOMPRESS_ONLY, &task->_config);
(void) astcenc_context_alloc(&task->_config, (unsigned int)_threads.size(), &task->_context); (void) astcenc_context_alloc(&task->_config, (unsigned int) _threads.size(), &task->_context);
task->_context->manage_decompress.init(total_blocks); task->_context->manage_decompress.init(total_blocks);
#endif #endif
return task; return task;