Changeset 100 for trunk/src/gl

Timestamp:

06/03/13 23:21:08 (12 years ago)

Author:

epyon

Message:

• vertex_buffer - assign changed to update, needs bind
• gfx/cached_buffer - initial implementation with buffer_slice proxies

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()
 {
-        if (data)
-        {
-                assign( data );
-        }
+        bind();
+        glBufferData( GL_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
+        unbind();
 }
 
-void gl_vertex_buffer::assign( void* data )
+void gl_vertex_buffer::update( void* data, int offset, int size )
 {
-        glBindBuffer( GL_ARRAY_BUFFER, m_name.get_value() );
-        glBufferData( GL_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
-        glBindBuffer( GL_ARRAY_BUFFER, 0);
-}
-
-void gl_vertex_buffer::assign( void* data, int offset, int size )
-{
-        glBindBuffer( GL_ARRAY_BUFFER, m_name.get_value() );
         glBufferSubData( GL_ARRAY_BUFFER, offset, size, data );
-        glBindBuffer( GL_ARRAY_BUFFER, 0);
 }
 
@@ -52 +42 @@
         : index_buffer( hint, size ), m_name()
 {
-        if (data)
-        {
-                assign( data );
-        }
+        bind();
+        glBufferData( GL_ELEMENT_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
+        unbind();
 }
 
-void gl_index_buffer::assign( void* data )
+void gl_index_buffer::update( void* data, int offset, int size )
 {
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_name.get_value() );
-        glBufferData( GL_ELEMENT_ARRAY_BUFFER, m_size, data, buffer_hint_to_enum( m_hint ) );
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0);
-}
-
-void gl_index_buffer::assign( void* data, int offset, int size )
-{
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_name.get_value() );
         glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, offset, size, data );
-        glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, 0);
 }