Changeset 299 for trunk/src/gl/gl_vertex_buffer.cc

Timestamp:

08/07/14 10:10:24 (11 years ago)

Author:

epyon

Message:

• all bind and update function for graphics objects are done via context (will simplify directx device, and allow for handles instead of objects)

File:

• trunk/src/gl/gl_vertex_buffer.cc (modified) (2 diffs)

trunk/src/gl/gl_vertex_buffer.cc

@@ -13 +13 @@
         : vertex_buffer( hint, size ), m_name()
 {
-        bind();
+        glBindBuffer( GL_ARRAY_BUFFER, m_name.get_value() );
         glBufferData( GL_ARRAY_BUFFER, (GLsizeiptr)m_size, data, buffer_hint_to_enum( m_hint ) );
-        unbind();
-}
-
-void gl_vertex_buffer::update( const void* data, size_t offset, size_t size )
-{
-        // IMPORTANT - THIS DOES NOT BIND, SHOULD IT?
-        glBufferSubData( GL_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)size, data );
-}
-
-
-void gl_vertex_buffer::bind()
-{
-        glBindBuffer( GL_ARRAY_BUFFER, m_name.get_value() );
-}
-
-void gl_vertex_buffer::unbind()
-{
         glBindBuffer( GL_ARRAY_BUFFER, 0 );
-}
-
-bool gl_vertex_buffer::is_valid() const
-{
-        return m_name.is_valid();
 }
 
@@ -43 +21 @@
         : index_buffer( hint, size ), m_name()
 {
-        bind();
+        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_name.get_value() );
         glBufferData( GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)m_size, data, buffer_hint_to_enum( m_hint ) );
-        unbind();
-}
-
-void gl_index_buffer::update( const void* data, size_t offset, size_t size )
-{
-        glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)size, data );
-}
-
-void gl_index_buffer::bind()
-{
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_name.get_value() );
-}
-
-void gl_index_buffer::unbind()
-{
         glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0 );
 }
 
-bool gl_index_buffer::is_valid() const
-{
-        return m_name.is_valid();
-}
-
-gl_vertex_array::gl_vertex_array()
-{
-
-}
-
-void gl_vertex_array::bind()
-{
-        for ( vertex_buffer_attribute_map::iterator i = m_map.begin();  i != 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 );
-                vb->bind();
-                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()
-                        );
-                vb->unbind();
-        }
-
-        if ( m_index )
-        {
-                m_index->bind();
-        }
-}
-
-void gl_vertex_array::unbind()
-{
-        if ( m_index )
-        {
-                m_index->unbind();
-        }
-
-        for ( vertex_buffer_attribute_map::iterator i = m_map.begin();  i != m_map.end(); ++i ) 
-        {
-                glDisableVertexAttribArray( static_cast<uint32>( i->first ) );
-        }
-}