Changeset 543 for trunk/src

Timestamp:

02/06/17 21:13:58 (8 years ago)

Author:

epyon

Message:

• fixes in handle store
• removal of get_handle
• indices instead of handles
• efficient handle store clears

Location:

trunk/src

Files:

• engine/particle_engine.cc (modified) (2 diffs)
• engine/particle_group.cc (modified) (3 diffs)
• fmod/fmod_audio.cc (modified) (2 diffs)
• gl/gl_context.cc (modified) (4 diffs)
• gl/gl_device.cc (modified) (4 diffs)
• sdl/sdl_audio.cc (modified) (2 diffs)

trunk/src/engine/particle_engine.cc

@@ -350 +350 @@
 }
 
+void nv::particle_engine::release( particle_system_info* info )
+{
+        if ( info )
+        {
+                m_pgm->unref( info->group );
+                delete[] info->particles;
+        }
+}
+
 void nv::particle_engine::clear()
 {
-        while ( m_systems.size() > 0 )
-                release( m_systems.get_handle( 0 ) );
+        for ( auto& s : m_systems )
+                release( &s );
+        m_systems.clear();
         if ( m_pgm )
                 m_pgm->reset();
@@ -363 +373 @@
 void nv::particle_engine::release( particle_system system )
 {
-        particle_system_info* info = m_systems.get( system );
-        if ( info )
-        {
-                m_pgm->unref( info->group );
-                delete[] info->particles;
+        if ( particle_system_info* info = m_systems.get( system ) )
+        {
+                release( info );
                 m_systems.destroy( system );
         }

trunk/src/engine/particle_group.cc

@@ -33 +33 @@
 void particle_group_manager::release( particle_group group )
 {
-        particle_group_info* info = m_groups.get( group );
-        if ( info )
-        {
-                delete[] info->quads;
-                m_context->release( info->vtx_array );
+        if ( particle_group_info* info = m_groups.get( group ) )
+        {
+                release( info );
                 m_groups.destroy( group );
         }
@@ -194 +192 @@
 }
 
+void nv::particle_group_manager::release( particle_group_info* info )
+{
+        if ( info )
+        {
+                delete[] info->quads;
+                m_context->release( info->vtx_array );
+        }
+}
+
 particle_group_manager::~particle_group_manager()
 {
@@ -201 +208 @@
 void particle_group_manager::clear()
 {
-        while ( m_groups.size() > 0 )
-                release( m_groups.get_handle( 0 ) );
+        for ( auto& g : m_groups )
+                release( &g );
+        m_groups.clear();
 }
 

trunk/src/fmod/fmod_audio.cc

@@ -107 +107 @@
 {
         sound_info* info = m_sounds.get( a_sound );
+        release( info );
+        m_sounds.destroy( a_sound );
+}
+
+void nv::fmod::audio::release( sound_info* info )
+{
         if ( info )
-        {
                 FMOD_Sound_Release( static_cast<FMOD_SOUND*>( info->fmod_sound ) );
-                m_sounds.destroy( a_sound );
-        }
 }
 
@@ -146 +149 @@
 fmod::audio::~audio()
 {
-        while ( m_sounds.size() > 0 )
-                release( m_sounds.get_handle(0) );
+        for ( auto& s : m_sounds )
+                release( &s );
+        m_sounds.clear();
         FMOD_System_Release( static_cast<FMOD_SYSTEM*>( m_system ) );
 }

trunk/src/gl/gl_context.cc

@@ -97 +97 @@
 void nv::gl_context::release( vertex_array va )
 {
-        gl_vertex_array_info* info = m_vertex_arrays.get( va );
+        if ( gl_vertex_array_info* info = m_vertex_arrays.get( va ) )
+        {
+                release( info );
+                m_vertex_arrays.destroy( va );
+        }
+}
+
+void nv::gl_context::release( gl_vertex_array_info* info )
+{
         if ( info )
         {
                 for ( uint32 i = 0; i < info->count; ++i )
                 {
-                        if ( info->attr[i].owner ) 
+                        if ( info->attr[i].owner )
                                 release( info->attr[i].vbuffer );
                 }
-                if ( info->index.is_valid() && info->index_owner) release( info->index );
+                if ( info->index.is_valid() && info->index_owner ) release( info->index );
                 glDeleteVertexArrays( 1, &info->glid );
-                m_vertex_arrays.destroy( va );
         }
 }
@@ -113 +120 @@
 void nv::gl_context::release( framebuffer f )
 {
-        gl_framebuffer_info* info = m_framebuffers.get( f );
+        if ( gl_framebuffer_info* info = m_framebuffers.get( f ) )
+        {
+                release( info );
+                m_framebuffers.destroy( f );
+        }
+}
+
+void nv::gl_context::release( gl_framebuffer_info* info )
+{
         if ( info )
         {
@@ -122 +137 @@
                         glDeleteRenderbuffers( 1, &info->depth_rb_glid );
                 glDeleteFramebuffers( 1, &info->glid );
-                m_framebuffers.destroy( f );
         }
 }
@@ -881 +895 @@
 nv::gl_context::~gl_context()
 {
-        while ( m_framebuffers.size() > 0 )
-                release( m_framebuffers.get_handle(0) );
-        while ( m_vertex_arrays.size() > 0 )
-                release( m_vertex_arrays.get_handle(0) );
+        for ( auto& info : m_framebuffers )
+                release( &info );
+        for ( auto& info : m_vertex_arrays )
+                release( &info );
 }
 

trunk/src/gl/gl_device.cc

@@ -69 +69 @@
 gl_device::~gl_device()
 {
-        while ( m_textures.size() > 0 )
-                release( m_textures.get_handle(0) );
-        while ( m_buffers.size() > 0 )
-                release( m_buffers.get_handle(0) );
-        while ( m_programs.size() > 0 )
-                release( m_programs.get_handle(0) );
-        while ( m_shaders.size() > 0 )
-                release( m_shaders.get_handle( 0 ) );
+        for ( auto& t : m_textures )
+                release( &t );
+        for ( auto& b : m_buffers )
+                release( &b );
+        for ( auto& p : m_programs )
+                release( &p );
+        for ( auto& s : m_shaders )
+                release( &s );
 }
 
@@ -131 +131 @@
 void nv::gl_device::release( texture t )
 {
-        gl_texture_info* info = m_textures.get( t );
-        if ( info )
-        {
-                if ( info->glid != 0 )
-                {
-                        glDeleteTextures( 1, &(info->glid) );
-                }
+        if ( auto info = m_textures.get( t ) )
+        {
+                release( info );
                 m_textures.destroy( t );
         }
 }
 
+void nv::gl_device::release( gl_shader_info* s )
+{
+        if ( s && s->ref == 0 && s->glid != 0 )
+                glDeleteShader( s->glid );
+}
+
+void nv::gl_device::release( gl_program_info* p )
+{
+        if ( p && p->glid != 0 )
+        {
+                for ( auto& i : *p->m_uniform_map )
+                        delete i.second;
+
+                gl_shader_info* vi = m_shaders.get( p->vertex );
+                gl_shader_info* fi = m_shaders.get( p->fragment );
+                if ( vi )
+                {
+                        glDetachShader( p->glid, vi->glid );
+                        vi->ref--;
+                        release( vi );
+                }
+                if ( fi )
+                {
+                        glDetachShader( p->glid, fi->glid );
+                        fi->ref--;
+                        release( fi );
+                }
+                glDeleteProgram( p->glid );
+
+                delete p->m_attribute_map;
+                delete p->m_engine_uniforms;
+                delete p->m_uniform_map;
+        }
+
+}
+
+void nv::gl_device::release( gl_texture_info* t )
+{
+        if ( t && t->glid != 0 )
+                glDeleteTextures( 1, &( t->glid ) );
+}
+
+void nv::gl_device::release( gl_buffer_info* b )
+{
+        if ( b && b->glid != 0 )
+                glDeleteBuffers( 1, &( b->glid ) );
+}
+
 void nv::gl_device::release( buffer b )
 {
-        gl_buffer_info* info = m_buffers.get( b );
-        if ( info )
-        {
-                if ( info->glid != 0 )
-                {
-                        glDeleteBuffers( 1, &(info->glid) );
-                }
+        if ( auto info = m_buffers.get( b ) )
+        {
+                release( info );
                 m_buffers.destroy( b );
         }
@@ -204 +244 @@
 void nv::gl_device::release( program p )
 {
-        gl_program_info* info = m_programs.get( p );
-        if ( info )
-        {
-                for ( auto& i : *info->m_uniform_map )
-                        delete i.second;
-
-                detach( p, info->vertex );
-                detach( p, info->fragment );
-                glDeleteProgram( info->glid );
-
-                delete info->m_attribute_map;
-                delete info->m_engine_uniforms;
-                delete info->m_uniform_map;
-
+        if ( auto info = m_programs.get( p ) )
+        {
+                release( info );
                 m_programs.destroy( p );
         }
@@ -224 +253 @@
 void nv::gl_device::release( shader s )
 {
-        gl_shader_info* info = m_shaders.get( s );
-        if ( info && info->ref == 0 )
-        {
-                glDeleteShader( info->glid );
+        if ( auto info = m_shaders.get( s ) )
+        {
+                release( info );
                 m_shaders.destroy( s );
         }

trunk/src/sdl/sdl_audio.cc

@@ -111 +111 @@
 nv::sdl::audio::~audio()
 {
-        while ( m_sounds.size() > 0 )
-                release( m_sounds.get_handle(0) );
+        for ( auto& s : m_sounds )
+                release( &s );
         Mix_CloseAudio();
         // TODO: should we do it here?
@@ -121 +121 @@
 {
         sound_info* info = m_sounds.get( a_sound );
+        release( info );
+        m_sounds.destroy( a_sound );
+}
+
+void nv::sdl::audio::release( sound_info* info )
+{
         if ( info )
-        {
                 Mix_FreeChunk( static_cast<Mix_Chunk*>( info->sdl_sound ) );
-                m_sounds.destroy( a_sound );
-        }
 }