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

trunk/src/gl/gl_context.cc

@@ -8 +8 @@
 #include "nv/lib/gl.hh"
 #include "nv/lib/sdl.hh"
+#include "nv/gl/gl_texture2d.hh"
+#include "nv/gl/gl_program.hh"
+#include "nv/gl/gl_vertex_buffer.hh"
 
 using namespace nv;
+
+void gl_context::bind( texture2d* texture, texture_slot slot )
+{
+        GLuint id = static_cast< gl_texture2d* >( texture )->m_name.get_value();
+        glActiveTexture( GL_TEXTURE0 + static_cast< GLenum >( slot ) );
+        glBindTexture( GL_TEXTURE_2D, id );
+}
+
+void nv::gl_context::bind( program* p )
+{
+        gl_program* glp = static_cast< gl_program* >( p );
+        glUseProgram( glp->m_name.get_value() );
+        glp->update_uniforms();
+}
+
+void nv::gl_context::bind( vertex_buffer* b )
+{
+        GLuint id = static_cast< gl_vertex_buffer* >( b )->m_name.get_value();
+        glBindBuffer( GL_ARRAY_BUFFER, id );
+}
+
+void nv::gl_context::bind( index_buffer* b )
+{
+        GLuint id = static_cast< gl_index_buffer* >( b )->m_name.get_value();
+        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::unbind( program* )
+{
+        glUseProgram( 0 );
+}
+
+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 gl_context::update( texture2d* texture, void* data )
+{
+        GLuint id = static_cast< gl_texture2d* >( texture )->m_name.get_value();
+        image_format format = texture->get_format();
+        ivec2        size   = texture->get_size();
+
+        glBindTexture( GL_TEXTURE_2D, id );
+        glTexImage2D( GL_TEXTURE_2D, 0, (GLint)nv::image_format_to_enum(format.format), size.x, size.y, 0, nv::image_format_to_enum(format.format), nv::datatype_to_gl_enum(format.type), data );
+}
+
+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::clear( const clear_state& cs )
@@ -372 +477 @@
 }
 
-
 void gl_context::draw( primitive prim, const render_state& rs, program* p, vertex_array* va, size_t count )
 {
@@ -378 +482 @@
         if ( count > 0 )
         {
-                p->bind();
-                va->bind();
+                bind( p );
+                bind( va );
                 if ( va->has_index_buffer() )
                 {
@@ -388 +492 @@
                         glDrawArrays( primitive_to_enum(prim), 0, static_cast<GLsizei>( count ) );
                 }
-                va->unbind();
-                p->unbind();
+                unbind( va );
+                //unbind( p );
         }
 }