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

Timestamp:

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

Author:

epyon

Message:

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

File:

• trunk/src/gl/gl_device.cc (modified) (3 diffs)

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