Changeset 469 for trunk/nv/interface/context.hh

Timestamp:

09/17/15 17:17:20 (10 years ago)

Author:

epyon

Message:

• stl/short_string - minor fix
• stl/utility - max for 3 arguments
• stl/math length_sq
• interface/context - proper handling of buffer ownage in va's
• wx/canvas - sleep added

File:

• trunk/nv/interface/context.hh (modified) (2 diffs)

trunk/nv/interface/context.hh

@@ -125 +125 @@
 
                 template < typename VTX, slot SLOT >
-                void add_vertex_buffer_impl( vertex_array, buffer, const false_type& )
+                void add_vertex_buffer_impl( vertex_array, buffer, bool, const false_type& )
                 {
                 }
 
                 template < typename VTX, slot SLOT >
-                void add_vertex_buffer_impl( vertex_array va, buffer vb, const true_type& )
+                void add_vertex_buffer_impl( vertex_array va, buffer vb, bool owned, const true_type& )
                 {
                         typedef slot_info< VTX, SLOT > vinfo;
                         typedef datatype_traits< typename vinfo::value_type > dt_traits;
-                        add_vertex_buffer( va, SLOT, vb, type_to_enum< typename dt_traits::base_type >::type, dt_traits::size, vinfo::offset, sizeof( VTX ), false );
+                        add_vertex_buffer( va, SLOT, vb, type_to_enum< typename dt_traits::base_type >::type, dt_traits::size, vinfo::offset, sizeof( VTX ), owned );
                 }
 
                 template < typename VTX, slot SLOT >
-                void add_vertex_buffer( vertex_array va, buffer vb )
-                {
-                        add_vertex_buffer_impl< VTX, SLOT >( va, vb, has_slot< VTX, SLOT >() );
+                void add_vertex_buffer( vertex_array va, buffer vb, bool owned )
+                {
+                        add_vertex_buffer_impl< VTX, SLOT >( va, vb, owned, has_slot< VTX, SLOT >() );
                 }
 
                 template < typename VTX >
-                void add_vertex_buffers( vertex_array va, buffer vb )
-                {
-                        add_vertex_buffer< VTX, slot::POSITION >  ( va, vb );
-                        add_vertex_buffer< VTX, slot::TEXCOORD >  ( va, vb );
-                        add_vertex_buffer< VTX, slot::NORMAL   >  ( va, vb );
-                        add_vertex_buffer< VTX, slot::TANGENT >   ( va, vb );
-                        add_vertex_buffer< VTX, slot::BONEINDEX > ( va, vb );
-                        add_vertex_buffer< VTX, slot::BONEWEIGHT >( va, vb );
-                        add_vertex_buffer< VTX, slot::COLOR >     ( va, vb );
+                void add_vertex_buffers( vertex_array va, buffer vb, bool owned )
+                {
+                        add_vertex_buffer< VTX, slot::POSITION >  ( va, vb, owned );
+                        add_vertex_buffer< VTX, slot::TEXCOORD >  ( va, vb, owned );
+                        add_vertex_buffer< VTX, slot::NORMAL   >  ( va, vb, owned );
+                        add_vertex_buffer< VTX, slot::TANGENT >   ( va, vb, owned );
+                        add_vertex_buffer< VTX, slot::BONEINDEX > ( va, vb, owned );
+                        add_vertex_buffer< VTX, slot::BONEWEIGHT >( va, vb, owned );
+                        add_vertex_buffer< VTX, slot::COLOR >     ( va, vb, owned );
                 }
 
@@ -182 +182 @@
                 vertex_array create_vertex_array( const VTX* v, size_t count, buffer_hint hint )
                 {
-                        // TODO: vb will not be owned or freed!
                         vertex_array va = create_vertex_array();
                         buffer       vb = m_device->create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
-                        add_vertex_buffers< VTX >( va, vb );
+                        add_vertex_buffers< VTX >( va, vb, true );
                         return va;
                 }