X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frender%2Fprogramdata.cpp;h=1ef013ddac86e5a6be72643fe711764f01428d30;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hp=e8e30e6344c8d4ca6c982027bab6f73195376bfd;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index e8e30e63..1ef013dd 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -67,6 +67,7 @@ ProgramData &ProgramData::operator=(const ProgramData &other)
 
 	for(SharedBlock &b: blocks)
 		delete b.block;
+	blocks.clear();
 	programs.clear();
 
 	last_buffer_block = 0;
@@ -520,12 +521,12 @@ vector<ProgramData::ProgramBlock>::iterator ProgramData::get_program(const Progr
 
 void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program::UniformBlockInfo &info) const
 {
-	UInt8 *indices = block.indices.values;
+	uint8_t *indices = block.indices.values;
 	if(info.uniforms.size()>16)
 	{
 		if(block.indices.type_flag==0xFD)
 		{
-			block.indices.dynamic.values = new UInt8[info.uniforms.size()];
+			block.indices.dynamic.values = new uint8_t[info.uniforms.size()];
 			block.indices.type_flag = 0xFE;
 		}
 		indices = block.indices.dynamic.values;
@@ -587,7 +588,7 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program
 
 void ProgramData::update_block(SharedBlock &block, const Program::UniformBlockInfo &info) const
 {
-	const UInt8 *indices = block.get_uniform_indices();
+	const uint8_t *indices = block.get_uniform_indices();
 	for(unsigned i=0; i<info.uniforms.size(); ++i)
 	{
 		if(is_image(info.uniforms[i]->type))
@@ -733,7 +734,7 @@ ProgramData::SharedBlock::SharedBlock(Program::LayoutHash h):
 	indices.type_flag = 0xFD;
 }
 
-const UInt8 *ProgramData::SharedBlock::get_uniform_indices() const
+const uint8_t *ProgramData::SharedBlock::get_uniform_indices() const
 {
 	return (indices.type_flag==0xFE ? indices.dynamic.values : indices.values);
 }