Changeset 302 for trunk/src/gl/gl_device.cc

Timestamp:

08/07/14 19:06:34 (11 years ago)

Author:

epyon

Message:

• buffers and vertex_arrays are now handle based

File:

• trunk/src/gl/gl_device.cc (modified) (5 diffs)

trunk/src/gl/gl_device.cc

@@ -7 +7 @@
 #include "nv/gl/gl_window.hh"
 #include "nv/gl/gl_program.hh"
-#include "nv/gl/gl_vertex_buffer.hh"
 #include "nv/logging.hh"
 #include "nv/lib/sdl.hh"
@@ -56 +55 @@
 }
 
-vertex_buffer* gl_device::create_vertex_buffer( buffer_hint hint, size_t size, const void* source /*= nullptr */ )
-{
-        return new gl_vertex_buffer( hint, size, source );
-}
-
-index_buffer* gl_device::create_index_buffer( buffer_hint hint, size_t size, const void* source /*= nullptr */ )
-{
-        return new gl_index_buffer( hint, size, source );
-}
-
-vertex_array* gl_device::create_vertex_array()
-{
-        return new vertex_array();
-}
-
 // this is a temporary function that will be removed once we find a way to 
 // pass binary file data around
@@ -101 +85 @@
 gl_device::~gl_device()
 {
-        // TODO: better use release_texture
-        for ( auto& t : m_textures ) glDeleteTextures( 1, &t.glid );
+        while ( m_textures.size() > 0 )
+                release( m_textures.get_handle(0) );
+        while ( m_buffers.size() > 0 )
+                release( m_buffers.get_handle(0) );
 
         SDL_Quit();
@@ -142 +128 @@
 }
 
-void nv::gl_device::release_texture( texture t )
+void nv::gl_device::release( texture t )
 {
         gl_texture_info* info = m_textures.get( t );
         if ( info )
         {
-                glDeleteTextures( 1, &(info->glid) );
+                if ( info->glid != 0 )
+                {
+                        glDeleteTextures( 1, &(info->glid) );
+                }
                 m_textures.destroy( t );
+        }
+}
+
+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) );
+                }
+                m_buffers.destroy( b );
         }
 }
@@ -157 +159 @@
 }
 
+nv::buffer nv::gl_device::create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source /*= nullptr */ )
+{
+        unsigned glid   = 0;
+        unsigned glenum = buffer_type_to_enum( type );
+        glGenBuffers( 1, &glid );
+
+        glBindBuffer( glenum, glid );
+        glBufferData( glenum, (GLsizeiptr)size, source, buffer_hint_to_enum( hint ) );
+        glBindBuffer( glenum, 0 );
+
+        buffer result = m_buffers.create();
+        gl_buffer_info* info = m_buffers.get( result );
+        info->type = type;
+        info->hint = hint;
+        info->size = size;
+        info->glid = glid;
+        return result;
+}
+
+const buffer_info* nv::gl_device::get_buffer_info( buffer t )
+{
+        return m_buffers.get( t );
+}