X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=871336bb76b25b43b6928aa41b7384e7f0410f5b;hb=4e20afbda6adb0008e286bf7fb947438aeb7a97e;hp=31bde278f44b9405a9cd6bad27c750a33babe80a;hpb=2e09b4f72f06537431151fe8b2574e1aa886ad48;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 31bde278..871336bb 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -123,17 +123,7 @@ void PipelineState::set_texture(unsigned binding, const Texture *tex, const Samp
 	}
 }
 
-void PipelineState::set_uniforms(const DefaultUniformBlock *block)
-{
-	set_uniform_block_(-1, block);
-}
-
-void PipelineState::set_uniform_block(unsigned binding, const BufferBackedUniformBlock *block)
-{
-	set_uniform_block_(binding, block);
-}
-
-void PipelineState::set_uniform_block_(int binding, const UniformBlock *block)
+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)
@@ -267,6 +257,7 @@ void PipelineState::apply(unsigned mask) const
 					bound_tex_targets[t.binding] = t.texture->target;
 
 					glBindSampler(t.binding, t.sampler->id);
+					t.sampler->refresh();
 				}
 
 				t.changed = false;
@@ -282,12 +273,15 @@ void PipelineState::apply(unsigned mask) const
 				{
 					if(u.binding>=0)
 					{
-						const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(u.block);
-						glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, block->get_buffer()->id, block->get_offset(), block->get_data_size());
+						glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.block->get_buffer()->id, u.block->get_offset(), u.block->get_data_size());
 						bound_uniform_blocks[u.binding] = 1;
 					}
-					else
-						static_cast<const DefaultUniformBlock *>(u.block)->apply();
+					else if(shprog)
+					{
+						const char *data = static_cast<const char *>(u.block->get_data_pointer());
+						for(const Program::UniformCall &call: shprog->uniform_calls)
+							call.func(call.location, call.size, data+call.location*16);
+					}
 				}
 
 				u.changed = false;