From 6f3cc509e4bf02eada6a7f22bc7a7f29fe689391 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Thu, 3 Jan 2013 23:39:18 -0800 Subject: [PATCH] Fixed tool memory leak. --- examples/06-bump/bump.cpp | 2 ++ src/vertexdecl.cpp | 9 ++++++--- tools/geometryc/geometryc.cpp | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/examples/06-bump/bump.cpp b/examples/06-bump/bump.cpp index 285f4c15f..cc8be8506 100644 --- a/examples/06-bump/bump.cpp +++ b/examples/06-bump/bump.cpp @@ -244,6 +244,8 @@ void calcTangents(void* _vertices, uint16_t _numVertices, bgfx::VertexDecl _decl tangent[3] = vec3Dot(nxt, tanv) < 0.0f ? -1.0f : 1.0f; bgfx::vertexPack(tangent, true, bgfx::Attrib::Tangent, _decl, _vertices, ii); } + + delete [] tangents; } int _main_(int _argc, char** _argv) diff --git a/src/vertexdecl.cpp b/src/vertexdecl.cpp index 9f259674e..7fc06782b 100644 --- a/src/vertexdecl.cpp +++ b/src/vertexdecl.cpp @@ -9,6 +9,9 @@ #include "vertexdecl.h" +extern void dbgPrintf(const char* _format, ...); +extern void dbgPrintfData(const void* _data, uint32_t _size, const char* _format, ...); + namespace bgfx { static const uint8_t s_attribTypeSizeDx9[AttribType::Count][4] = @@ -114,9 +117,9 @@ namespace bgfx void dump(const VertexDecl& _decl) { #if BGFX_CONFIG_DEBUG - BX_TRACE("vertexdecl %08x (%08x), stride %d" + dbgPrintf("vertexdecl %08x (%08x), stride %d" , _decl.m_hash - , hashMurmur2A(_decl.m_attributes, sizeof(_decl.m_attributes) ) + , bx::hashMurmur2A(_decl.m_attributes, sizeof(_decl.m_attributes) ) , _decl.m_stride ); @@ -130,7 +133,7 @@ namespace bgfx bool asInt; _decl.decode(Attrib::Enum(attr), num, type, normalized, asInt); - BX_TRACE("\tattr %d - %s, num %d, type %d, norm %d, asint %d, offset %d" + dbgPrintf("\tattr %d - %s, num %d, type %d, norm %d, asint %d, offset %d" , attr , getAttribName(Attrib::Enum(attr) ) , num diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp index 6b348d174..19a81c608 100644 --- a/tools/geometryc/geometryc.cpp +++ b/tools/geometryc/geometryc.cpp @@ -230,6 +230,8 @@ void calcTangents(void* _vertices, uint16_t _numVertices, bgfx::VertexDecl _decl tangent[3] = vec3Dot(nxt, tanv) < 0.0f ? -1.0f : 1.0f; bgfx::vertexPack(tangent, true, bgfx::Attrib::Tangent, _decl, _vertices, ii); } + + delete [] tangents; } void writeBounds(bx::WriterI* _writer, const void* _vertices, uint32_t _numVertices, uint32_t _stride)