Changeset 543 for trunk/src/gl/gl_context.cc

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

File:

• trunk/src/gl/gl_context.cc (modified) (4 diffs)

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 );
 }