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

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 31bde278..262dd26b 100644
--- a/source/core/pipelinestate.cpp
+++ b/source/core/pipelinestate.cpp
@@ -5,6 +5,7 @@
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_array_object.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
 #include <msp/gl/extensions/msp_primitive_restart.h>
 #include "blend.h"
 #include "buffer.h"
@@ -45,9 +46,9 @@ PipelineState::PipelineState():
 	changes(0)
 {
 	if(bound_tex_targets.empty())
-		bound_tex_targets.resize(Limits::get_global().max_texture_bindings);
+		bound_tex_targets.resize(DeviceInfo::get_global().limits.max_texture_bindings);
 	if(bound_uniform_blocks.empty())
-		bound_uniform_blocks.resize(Limits::get_global().max_uniform_bindings);
+		bound_uniform_blocks.resize(DeviceInfo::get_global().limits.max_uniform_bindings);
 }
 
 PipelineState::~PipelineState()
@@ -123,17 +124,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)
@@ -237,7 +228,7 @@ void PipelineState::apply(unsigned mask) const
 
 	if(mask&CLIP_PLANES)
 	{
-		unsigned max_clip_planes = Limits::get_global().max_clip_planes;
+		unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes;
 		for(unsigned i=0; i<max_clip_planes; ++i)
 		{
 			if((enabled_clip_planes>>i)&1)
@@ -267,6 +258,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 +274,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;
@@ -327,9 +322,14 @@ void PipelineState::apply(unsigned mask) const
 			glBlendEquation(get_gl_blend_equation(blend->equation));
 			glBlendFunc(get_gl_blend_factor(blend->src_factor), get_gl_blend_factor(blend->dst_factor));
 			glBlendColor(blend->constant.r, blend->constant.g, blend->constant.b, blend->constant.a);
+			ColorWriteMask cw = blend->write_mask;
+			glColorMask((cw&WRITE_RED)!=0, (cw&WRITE_GREEN)!=0, (cw&WRITE_BLUE)!=0, (cw&WRITE_ALPHA)!=0);
 		}
 		else
+		{
 			glDisable(GL_BLEND);
+			glColorMask(true, true, true, true);
+		}
 	}
 
 	last_applied = this;
@@ -343,7 +343,7 @@ void PipelineState::clear()
 		glUseProgram(0);
 		glBindVertexArray(0);
 
-		unsigned max_clip_planes = Limits::get_global().max_clip_planes;
+		unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes;
 		for(unsigned i=0; i<max_clip_planes; ++i)
 			if((last_applied->enabled_clip_planes>>i)&1)
 				glDisable(GL_CLIP_PLANE0+i);