VBO_CONTAINER: Changed new[]/delete[] pairs to realloc(), possibly reducing... (bc8ea550) · Commits · Elphel / kicad-source-mirror

common/gal/opengl/vbo_container.cpp

+9 −10

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@

	#include <gal/opengl/vbo_container.h>		#include <gal/opengl/vbo_container.h>
	#include <cstring>		#include <cstring>
			#include <cstdlib>
	#include <wx/log.h>		#include <wx/log.h>
	#ifdef __WXDEBUG__		#ifdef __WXDEBUG__
	#include <profile.h>		#include <profile.h>
	@@ -42,7 +43,7 @@ VBO_CONTAINER::VBO_CONTAINER( int aSize ) :
	// By default no shader is used		// By default no shader is used
	m_shader[0] = 0;		m_shader[0] = 0;

	m_vertices = new VBO_VERTEX[aSize];		m_vertices = static_cast<VBO_VERTEX>( malloc( aSize sizeof( VBO_VERTEX ) ) );

	// In the beginning there is only free space		// In the beginning there is only free space
	m_freeChunks.insert( Chunk( aSize, 0 ) );		m_freeChunks.insert( Chunk( aSize, 0 ) );
	@@ -51,7 +52,7 @@ VBO_CONTAINER::VBO_CONTAINER( int aSize ) :

	VBO_CONTAINER::~VBO_CONTAINER()		VBO_CONTAINER::~VBO_CONTAINER()
	{		{
	delete[] m_vertices;		free( m_vertices );
	}		}


	@@ -116,7 +117,7 @@ void VBO_CONTAINER::Add( VBO_ITEM* aVboItem, const VBO_VERTEX* aVertex, unsigned
	itemSize * VBO_ITEM::VertByteSize );		itemSize * VBO_ITEM::VertByteSize );

	// Return memory used by the previous chunk		// Return memory used by the previous chunk
	free( it );		freeChunk( it );

	itemChunkSize = newSize;		itemChunkSize = newSize;
	}		}
	@@ -266,7 +267,7 @@ unsigned int VBO_CONTAINER::allocate( VBO_ITEM* aVboItem, unsigned int aSize )
	}		}


	void VBO_CONTAINER::free( const ReservedChunkMap::iterator& aChunk )		void VBO_CONTAINER::freeChunk( const ReservedChunkMap::iterator& aChunk )
	{		{
	// Remove the chunk from the reserved chunks map and add to the free chunks map		// Remove the chunk from the reserved chunks map and add to the free chunks map
	int size = getChunkSize( *aChunk );		int size = getChunkSize( *aChunk );
	@@ -289,7 +290,7 @@ bool VBO_CONTAINER::defragment( VBO_VERTEX* aTarget )
	if( aTarget == NULL )		if( aTarget == NULL )
	{		{
	// No target was specified, so we have to allocate our own space		// No target was specified, so we have to allocate our own space
	aTarget = new (std::nothrow) VBO_VERTEX[m_currentSize];		aTarget = static_cast<VBO_VERTEX>( malloc( m_currentSize sizeof( VBO_VERTEX ) ) );
	if( aTarget == NULL )		if( aTarget == NULL )
	{		{
	wxLogError( wxT( "Run out of memory" ) );		wxLogError( wxT( "Run out of memory" ) );
	@@ -316,7 +317,7 @@ bool VBO_CONTAINER::defragment( VBO_VERTEX* aTarget )
	newOffset += itemSize;		newOffset += itemSize;
	}		}

	delete[] m_vertices;		free( m_vertices );
	m_vertices = aTarget;		m_vertices = aTarget;

	// Now there is only one big chunk of free memory		// Now there is only one big chunk of free memory
	@@ -363,15 +364,13 @@ bool VBO_CONTAINER::resizeContainer( unsigned int aNewSize )
	copySize = m_currentSize;		copySize = m_currentSize;
	}		}

	VBO_VERTEX* newContainer = new (std::nothrow) VBO_VERTEX[aNewSize];		VBO_VERTEX* newContainer = static_cast<VBO_VERTEX>( realloc( m_vertices, aNewSize sizeof( VBO_VERTEX ) ) );
	if( newContainer == NULL )		if( newContainer == NULL )
	{		{
	wxLogError( wxT( "Run out of memory" ) );		wxLogError( wxT( "Run out of memory" ) );
	return false;		return false;
	}		}

	memcpy( newContainer, m_vertices, copySize * VBO_ITEM::VertByteSize );
	delete[] m_vertices;
	m_vertices = newContainer;		m_vertices = newContainer;

	// Update variables		// Update variables
	@@ -391,7 +390,7 @@ bool VBO_CONTAINER::resizeContainer( unsigned int aNewSize )
	{		{
	// We found a chunk at the end of the container		// We found a chunk at the end of the container
	m_freeChunks.erase( lastFree.base() );		m_freeChunks.erase( lastFree.base() );
	// so we can merge it with the new free chunk		// so we can merge it with the new freeChunk chunk
	m_freeChunks.insert( Chunk( aNewSize - m_currentSize + lastFreeSize, // size		m_freeChunks.insert( Chunk( aNewSize - m_currentSize + lastFreeSize, // size
	m_currentSize - lastFreeSize ) ); // offset		m_currentSize - lastFreeSize ) ); // offset
	}		}

include/gal/opengl/vbo_container.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,7 @@ public:
	inline void Free( VBO_ITEM* aVboItem )		inline void Free( VBO_ITEM* aVboItem )
	{		{
	ReservedChunkMap::iterator it = m_reservedChunks.find( aVboItem );		ReservedChunkMap::iterator it = m_reservedChunks.find( aVboItem );
	free( it );		freeChunk( it );

	// Dynamic memory freeing, there is no point in holding		// Dynamic memory freeing, there is no point in holding
	// a large amount of memory when there is no use for it		// a large amount of memory when there is no use for it
	@@ -294,11 +294,11 @@ private:
	bool resizeContainer( unsigned int aNewSize );		bool resizeContainer( unsigned int aNewSize );

	/**		/**
	* Function free()		* Function freeChunk()
	* Frees the space described in aChunk and returns it to the free space pool.		* Frees the space described in aChunk and returns it to the free space pool.
	* @param aChunk is a space to be freed.		* @param aChunk is a space to be freed.
	*/		*/
	void free( const ReservedChunkMap::iterator& aChunk );		void freeChunk( const ReservedChunkMap::iterator& aChunk );

	///< How many vertices we can store in the container		///< How many vertices we can store in the container
	unsigned int m_freeSpace;		unsigned int m_freeSpace;

Admin message