X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=feb429a6eb126cc851f600c6e74144c698bcd5d9;hp=fd474d28f3f106d0dcdf1226a28d42755877b09d;hb=362534d5838123150311360b465026edba38bb7d;hpb=b4941cd1f0b0b5d9cebc978379b4936a5070ca92

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index fd474d28..feb429a6 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -44,13 +44,13 @@ void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
 	auto i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
 	if(i==uniform_blocks.end() || i->binding!=binding)
 		i = uniform_blocks.insert(i, BoundUniformBlock(binding));
-	i->used = block;
 	const Buffer *buffer = (block ? block->get_buffer() : 0);
 	if(block!=i->block || buffer!=i->buffer || binding<0)
 	{
 		i->block = block;
 		i->buffer = buffer;
 		i->changed = true;
+		i->used = block;
 		changes |= UNIFORMS;
 	}
 }
@@ -70,13 +70,13 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, int level,
 	auto i = lower_bound_member(textures, binding, &BoundTexture::binding);
 	if(i==textures.end() || i->binding!=binding)
 		i = textures.insert(i, BoundTexture(binding));
-	i->used = (tex && samp);
 	if(tex!=i->texture || level!=i->level || samp!=i->sampler)
 	{
 		i->texture = tex;
 		i->sampler = samp;
 		i->level = level;
 		i->changed = true;
+		i->used = (tex && samp);
 		changes |= TEXTURES;
 	}
 }