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

Timestamp:

06/15/16 18:34:37 (9 years ago)

Author:

epyon

Message:

• particle engine updates
• device/context redesign
• caching of GL state - texture bindings and programs
• camera view_perspective and view_perspective_inv

File:

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

trunk/nv/interface/context.hh

@@ -157 +157 @@
                 virtual void release( framebuffer ) = 0;
 
+                virtual void release( program p ) { m_device->release( p ); }
+                virtual void release( texture t ) { m_device->release( t ); }
+                virtual void release( buffer b ) { m_device->release( b ); }
+
+                virtual texture create_texture( texture_type type, ivec2 size, image_format aformat, sampler asampler, const void* data = nullptr ) = 0;
+                virtual texture create_texture( texture_type type, ivec3 size, image_format aformat, sampler asampler, const void* data = nullptr ) = 0;
+                virtual texture create_texture( texture_type type, pixel_format format ) { return m_device->create_texture( type, format ); }
+                // TODO: remove?
+                virtual texture create_texture( ivec2 size, image_format aformat, sampler asampler, const void* data = nullptr )
+                { 
+                        return create_texture( TEXTURE_2D, size, aformat, asampler, data );
+                }
+                virtual texture create_texture( const image_data* data, sampler asampler )
+                {
+                        return create_texture( data->get_size(), data->get_format(), asampler, data->get_data() );
+                }
+
+
+                virtual program create_program( string_view vs_source, string_view fs_source ) { return m_device->create_program( vs_source, fs_source ); }
+                virtual buffer create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source = nullptr ) = 0;
+                virtual void   create_buffer( buffer, size_t, const void* = nullptr ) = 0;
+
+
                 virtual const framebuffer_info* get_framebuffer_info( framebuffer ) const = 0;
 
@@ -219 +242 @@
                 vertex_array create_vertex_array( const VTX* v, size_t count, buffer_hint hint )
                 {
-                        buffer       vb = m_device->create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
+                        buffer       vb = create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
                         vertex_array_desc desc;
                         desc.add_vertex_buffers< VTX >( vb, true );
@@ -228 +251 @@
                 vertex_array create_vertex_array( const VTX* v, size_t vcount, const IDX* i, size_t icount, buffer_hint hint )
                 {
-                        buffer       vb = m_device->create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
-                        buffer       ib = m_device->create_buffer( INDEX_BUFFER, hint, icount * sizeof( IDX ), i );
+                        buffer       vb = create_buffer( VERTEX_BUFFER, hint, count * sizeof( VTX ), v );
+                        buffer       ib = create_buffer( INDEX_BUFFER, hint, icount * sizeof( IDX ), i );
                         vertex_array_desc desc;
                         desc.add_vertex_buffers< VTX >( vb, true );
@@ -248 +271 @@
                                         if ( desc[0].vslot == slot::INDEX )
                                         {
-                                                buffer b = m_device->create_buffer( INDEX_BUFFER, hint, channel.raw_size(), channel.raw_data() );
+                                                buffer b = create_buffer( INDEX_BUFFER, hint, channel.raw_size(), channel.raw_data() );
                                                 va_desc.set_index_buffer( b, desc[0].etype, true );
                                         }
                                         else
                                         {
-                                                buffer b = m_device->create_buffer( VERTEX_BUFFER, hint, channel.raw_size(), channel.raw_data() );
+                                                buffer b = create_buffer( VERTEX_BUFFER, hint, channel.raw_size(), channel.raw_data() );
                                                 va_desc.add_vertex_buffers( b, desc );
                                         }