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

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 4133b9ac..b21c395c 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -566,7 +566,7 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program
 		{
 			if(!buffer)
 			{
-				buffer = new Buffer(UNIFORM_BUFFER);
+				buffer = new Buffer();
 
 #ifdef DEBUG
 				if(!debug_name.empty())
@@ -657,11 +657,6 @@ void ProgramData::apply() const
 
 		prog_begin->masks.dirty = 0;
 
-		/* If any blocks stored in the buffer were updated, bind the buffer here
-		to avoid state thrashing. */
-		if(buffered_blocks_updated && !ARB_direct_state_access)
-			buffer->bind();
-
 		if(last_buffer_block!=old_last_block)
 		{
 			unsigned required_size = last_buffer_block->get_required_buffer_size();
@@ -670,7 +665,7 @@ void ProgramData::apply() const
 				if(buffer->get_size()>0)
 				{
 					delete buffer;
-					buffer = new Buffer(UNIFORM_BUFFER);
+					buffer = new Buffer();
 					last_buffer_block->change_buffer(buffer);
 
 #ifdef DEBUG