Changeset 302 for trunk/src/gl/gl_context.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_context.cc (modified) (5 diffs)

trunk/src/gl/gl_context.cc

@@ -10 +10 @@
 #include "nv/gl/gl_device.hh"
 #include "nv/gl/gl_program.hh"
-#include "nv/gl/gl_vertex_buffer.hh"
 
 using namespace nv;
@@ -31 +30 @@
 }
 
-void nv::gl_context::bind( vertex_buffer* b )
-{
-        GLuint id = static_cast< gl_vertex_buffer* >( b )->glid;
-        glBindBuffer( GL_ARRAY_BUFFER, id );
-}
-
-void nv::gl_context::bind( index_buffer* b )
-{
-        GLuint id = static_cast< gl_index_buffer* >( b )->glid;
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, id );
-}
-
-void nv::gl_context::bind( vertex_array* va )
-{
-        for ( vertex_buffer_attribute_map::iterator i = va->m_map.begin();      i != va->m_map.end(); ++i ) 
-        {
-                uint32 location             = static_cast<uint32>( i->first );
-                vertex_buffer_attribute* va = i->second;
-                vertex_buffer*           vb = va->get_buffer();
-                glEnableVertexAttribArray( location );
-                bind( vb );
-                glVertexAttribPointer( 
-                        location, 
-                        static_cast<GLint>( va->get_components() ), 
-                        nv::datatype_to_gl_enum( va->get_datatype() ),
-                        GL_FALSE,
-                        static_cast<GLsizei>( va->get_stride() ),
-                        (void*)va->get_offset()
-                        );
-                unbind( vb );
-        }
-
-        if ( va->m_index )
-        {
-                bind( va->m_index );
+void nv::gl_context::bind( buffer b )
+{
+        const gl_buffer_info* info = static_cast< const gl_buffer_info* >( m_device->get_buffer_info( b ) );
+        if ( info )
+        {
+                glBindBuffer( buffer_type_to_enum( info->type ), info->glid );
+        }
+}
+
+void nv::gl_context::bind( vertex_array va )
+{
+        vertex_array_info* info = get_vertex_array_info( va );
+        if ( info )
+        {
+                for ( uint32 i = 0; i < info->count; ++i ) 
+                {
+                        const vertex_buffer_attribute& vba = info->attr[i];
+                        uint32 location                    = static_cast<uint32>( vba.location );
+                        glEnableVertexAttribArray( location );
+                        bind( vba.vbuffer );
+                        glVertexAttribPointer( 
+                                location, 
+                                static_cast<GLint>( vba.components ), 
+                                nv::datatype_to_gl_enum( vba.dtype ),
+                                GL_FALSE,
+                                static_cast<GLsizei>( vba.stride ),
+                                (void*)vba.offset
+                                );
+                        unbind( vba.vbuffer );
+                }
+
+                if ( info->index.is_valid() )
+                {
+                        bind( info->index );
+                }
         }
 }
@@ -74 +73 @@
 }
 
-void nv::gl_context::unbind( vertex_buffer* )
-{
-        glBindBuffer( GL_ARRAY_BUFFER, 0 );
-}
-
-void nv::gl_context::unbind( index_buffer* )
-{
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0 );
-}
-
-void nv::gl_context::unbind( vertex_array* va )
-{
-        if ( va->m_index )
-        {
-                unbind( va->m_index );
-        }
-
-        for ( vertex_buffer_attribute_map::iterator i = va->m_map.begin();      i != va->m_map.end(); ++i ) 
-        {
-                glDisableVertexAttribArray( static_cast<uint32>( i->first ) );
+void nv::gl_context::unbind( buffer b )
+{
+        const gl_buffer_info* info = static_cast< const gl_buffer_info* >( m_device->get_buffer_info( b ) );
+        if ( info )
+        {
+                glBindBuffer( buffer_type_to_enum( info->type ), 0 );
+        }
+}
+
+void nv::gl_context::unbind( vertex_array va )
+{
+        vertex_array_info* info = get_vertex_array_info( va );
+        if ( info )
+        {
+                if ( info->index.is_valid() )
+                {
+                        unbind( info->index );
+                }
+
+                for ( uint32 i = 0; i < info->count; ++i ) 
+                {
+                        glDisableVertexAttribArray( static_cast<uint32>( info->attr[i].location ) );
+                }
         }
 }
@@ -110 +112 @@
 }
 
-void gl_context::update( vertex_buffer* b, const void* data, size_t offset, size_t size )
-{
-        bind( b );
-        glBufferSubData( GL_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)size, data );
-}
-
-void gl_context::update( index_buffer* b, const void* data, size_t offset, size_t size )
-{
-        bind( b );
-        glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)size, data );
+void gl_context::update( buffer b, const void* data, size_t offset, size_t size )
+{
+        const gl_buffer_info* info = static_cast< const gl_buffer_info* >( m_device->get_buffer_info( b ) );
+        if ( info )
+        {
+                bind( b );
+                glBufferSubData( buffer_type_to_enum( info->type ), (GLintptr)offset, (GLsizeiptr)size, data );
+        }
 }
 
@@ -483 +483 @@
 }
 
-void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array* va, size_t count )
+void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array va, size_t count )
 {
         apply_render_state( rs );
-        if ( count > 0 )
+        vertex_array_info* info = get_vertex_array_info( va );
+        if ( count > 0 && info )
         {
                 bind( p );
                 bind( va );
-                if ( va->has_index_buffer() )
-                {
-                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( va->get_index_buffer_type() ), 0 );
+                if ( info->index.is_valid() )
+                {
+                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( info->index_type ), 0 );
                 }
                 else