Changeset 485 for trunk/src/gl/gl_device.cc

Timestamp:

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

Author:

epyon

Message:

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

File:

• trunk/src/gl/gl_device.cc (modified) (1 diff)

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;
 }