X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.cpp;h=4133b9acaabb207fbd63d077ca9bc8da7bcca2c4;hb=fcde8390ad577fe434dcd4b29e0f410d29f867c9;hp=f3c6108c767284a9e158ee88df7fdd9a5986873d;hpb=bb386d895f5fce2f0099886fdf7e7073b18246e8;p=libs%2Fgl.git

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index f3c6108c..4133b9ac 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -565,8 +565,15 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program
 		if(info.bind_point>=0)
 		{
 			if(!buffer)
+			{
 				buffer = new Buffer(UNIFORM_BUFFER);
 
+#ifdef DEBUG
+				if(!debug_name.empty())
+					buffer->set_debug_name(debug_name);
+#endif
+			}
+
 			BufferBackedUniformBlock *bb_block = new BufferBackedUniformBlock(info.data_size);
 			block.block = bb_block;
 			bb_block->use_buffer(buffer, last_buffer_block);
@@ -665,6 +672,11 @@ void ProgramData::apply() const
 					delete buffer;
 					buffer = new Buffer(UNIFORM_BUFFER);
 					last_buffer_block->change_buffer(buffer);
+
+#ifdef DEBUG
+					if(!debug_name.empty())
+						buffer->set_debug_name(debug_name);
+#endif
 				}
 
 				buffer->storage(required_size);
@@ -677,6 +689,17 @@ void ProgramData::apply() const
 			i->block->apply(i->bind_point);
 }
 
+void ProgramData::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	debug_name = name;
+	if(buffer)
+		buffer->set_debug_name(name);
+#else
+	(void)name;
+#endif
+}
+
 
 ProgramData::TaggedUniform::TaggedUniform():
 	value(0)