Changeset 473 for trunk/src/gl

Timestamp:

10/09/15 14:06:56 (10 years ago)

Author:

epyon

Message:

• rtti updates
• device/context initial uniform buffer support
• fixes

Location:

trunk/src/gl

Files:

• gl_context.cc (modified) (4 diffs)
• gl_device.cc (modified) (3 diffs)
• gl_enum.cc (modified) (1 diff)

trunk/src/gl/gl_context.cc

@@ -205 +205 @@
         {
                 glBindFramebuffer( framebuffer_slot_to_enum(ft), 0 );
+        }
+}
+
+void nv::gl_context::bind( buffer b, uint32 index, size_t offset /*= 0*/, size_t size /*= 0 */ )
+{
+        const gl_buffer_info* info = static_cast< const gl_buffer_info* >( m_device->get_buffer_info( b ) );
+        if ( info )
+        {
+                if ( size == 0 )
+                        glBindBufferBase( buffer_type_to_enum( info->type ), index, info->glid );
+                else
+                        glBindBufferRange( buffer_type_to_enum( info->type ), index, info->glid, offset, size );
         }
 }
@@ -339 +351 @@
                 else
                         glTexImage2D( gl_type, 0, static_cast<GLint>( nv::image_format_to_internal_enum(format.format) ), size.x, size.y, 0, nv::image_format_to_enum(format.format), nv::datatype_to_gl_enum(format.type), data );
+        }
+}
+
+void nv::gl_context::update( buffer b, uint32 index, 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 )
+        {
+                GLenum glenum = buffer_type_to_enum( info->type );
+                if ( size == 0 )
+                        glBindBufferBase( glenum, index, info->glid );
+                else
+                        glBindBufferRange( glenum, index, info->glid, offset, size );
+                glBufferSubData( glenum, GLintptr( offset ), GLsizeiptr( size ), data );
         }
 }
@@ -750 +776 @@
 }
 
-void gl_context::draw( primitive prim, const render_state& rs, program p, vertex_array va, nv::size_t count )
+void gl_context::draw( primitive prim, const render_state& rs, program p, vertex_array va, nv::size_t count, nv::size_t first )
 {
         apply_render_state( rs );
@@ -760 +786 @@
                 if ( info->index.is_valid() )
                 {
-                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( info->index_type ), 0 );
+                        glDrawElements( primitive_to_enum(prim), static_cast<GLsizei>( count ), datatype_to_gl_enum( info->index_type ), reinterpret_cast< const void* >( get_datatype_info( info->index_type ).size * first ) );
                 }
                 else
                 {
-                        glDrawArrays( primitive_to_enum(prim), 0, static_cast<GLsizei>( count ) );
+                        glDrawArrays( primitive_to_enum(prim), first, static_cast<GLsizei>( count ) );
                 }
                 unbind( va );

trunk/src/gl/gl_device.cc

@@ -337 +337 @@
                 }
         }
+        return -1;
+}
+
+int nv::gl_device::get_block_location( program p, const string_view& name, bool fatal /*= true */ ) const
+{
         return -1;
 }
@@ -450 +455 @@
 {
         int params;
+        int bparams;
         glGetProgramiv( p->glid, GL_ACTIVE_UNIFORMS, &params );
+        glGetProgramiv( p->glid, GL_ACTIVE_UNIFORM_BLOCKS, &bparams );
 
         for ( unsigned i = 0; i < unsigned( params ); ++i )
@@ -479 +486 @@
                 NV_ASSERT( u, "Unknown uniform type!" );
                 (*p->m_uniform_map)[ name ] = u;
+        }
+
+        for ( unsigned i = 0; i < unsigned( bparams ); ++i )
+        {
+                int uni_len;
+                char name_buffer[128];
+
+                glGetActiveUniformBlockName( p->glid, i, 128, &uni_len, name_buffer );
+                NV_LOG_INFO( string_view( name_buffer, size_t( uni_len ) ) );
         }
 }

trunk/src/gl/gl_enum.cc

@@ -168 +168 @@
         switch( type )
         {
-        case VERTEX_BUFFER : return GL_ARRAY_BUFFER;
-        case INDEX_BUFFER  : return GL_ELEMENT_ARRAY_BUFFER;
+        case VERTEX_BUFFER  : return GL_ARRAY_BUFFER;
+        case INDEX_BUFFER   : return GL_ELEMENT_ARRAY_BUFFER;
+        case UNIFORM_BUFFER : return GL_UNIFORM_BUFFER;
                 NV_RETURN_COVERED_DEFAULT( 0 );
         }