Changeset 485 for trunk/src/gl

Timestamp:

01/26/16 18:59:46 (9 years ago)

Author:

epyon

Message:

• massive update (need to start doing atomics again) :/

Location:

trunk/src/gl

Files:

• gl_context.cc (modified) (1 diff)
• gl_device.cc (modified) (1 diff)

trunk/src/gl/gl_context.cc

@@ -354 +354 @@
 }
 
-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 );
-        }
-}
+// 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 );
+//      }
+// }
 
 void gl_context::update( buffer b, const void* data, nv::size_t offset, nv::size_t size )

trunk/src/gl/gl_device.cc

@@ -340 +340 @@
 }
 
+bool nv::gl_device::bind_block( program p, const string_view& name, uint32 index )
+{
+        const gl_program_info* info = m_programs.get( p );
+        if ( info )
+        {
+                int id = get_block_location( p, name, false );
+                if ( id < 0 ) return false;
+                glUniformBlockBinding( info->glid, unsigned( id ), index );
+                return true;
+        }
+        return false;
+}
+
 int nv::gl_device::get_block_location( program p, const string_view& name, bool fatal /*= true */ ) const
 {
+        const gl_program_info* info = m_programs.get( p );
+        if ( info )
+        {
+                int result = glGetUniformBlockIndex( info->glid, name.data() );
+                if ( result >= 0 ) return result;
+                if ( fatal )
+                {
+                        NV_LOG_CRITICAL( "gl_device : block '", name, "' not found in program!" );
+                        NV_ABORT( "gl_device : block not found!" );
+                }
+        }
         return -1;
 }