X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.cpp;h=97f353dcee8b572c835e1ac5569ca9769489b246;hb=009918e76dda88b0cb68fdaa20c63d6e952af260;hp=30d2ab1c5ce5f5968f9c10f7e6fd0c204fa6bfe5;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/core/pipelinestate.cpp b/source/core/pipelinestate.cpp
index 30d2ab1c..97f353dc 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"
@@ -14,6 +15,7 @@
 #include "pipelinestate.h"
 #include "program.h"
 #include "rect.h"
+#include "sampler.h"
 #include "stenciltest.h"
 #include "texture.h"
 #include "uniformblock.h"
@@ -44,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()
@@ -122,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)
@@ -172,7 +164,7 @@ void PipelineState::apply(unsigned mask) const
 {
 	if(mask&FRAMEBUFFER)
 	{
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->get_id() : 0);
+		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer ? framebuffer->id : 0);
 		if(framebuffer)
 		{
 			framebuffer->refresh();
@@ -200,11 +192,11 @@ void PipelineState::apply(unsigned mask) const
 	}
 
 	if(mask&SHPROG)
-		glUseProgram(shprog ? shprog->get_id() : 0);
+		glUseProgram(shprog ? shprog->id : 0);
 
 	if(mask&VERTEX_SETUP)
 	{
-		glBindVertexArray(vertex_setup ? vertex_setup->get_id() : 0);
+		glBindVertexArray(vertex_setup ? vertex_setup->id : 0);
 		if(vertex_setup)
 		{
 			static Require _req(MSP_primitive_restart);
@@ -236,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)
@@ -254,18 +246,18 @@ void PipelineState::apply(unsigned mask) const
 				if(t.texture && t.sampler)
 				{
 					if(ARB_direct_state_access)
-						glBindTextureUnit(t.binding, t.texture->get_id());
+						glBindTextureUnit(t.binding, t.texture->id);
 					else
 					{
 						glActiveTexture(GL_TEXTURE0+t.binding);
-						if(bound_tex_targets[t.binding] && static_cast<int>(t.texture->get_target())!=bound_tex_targets[t.binding])
+						if(bound_tex_targets[t.binding] && static_cast<int>(t.texture->target)!=bound_tex_targets[t.binding])
 							glBindTexture(bound_tex_targets[t.binding], 0);
-						glBindTexture(t.texture->get_target(), t.texture->get_id());
+						glBindTexture(t.texture->target, t.texture->id);
 					}
 
-					bound_tex_targets[t.binding] = t.texture->get_target();
+					bound_tex_targets[t.binding] = t.texture->target;
 
-					glBindSampler(t.binding, t.sampler->get_id());
+					glBindSampler(t.binding, t.sampler->id);
 					t.sampler->refresh();
 				}
 
@@ -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()->get_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;
@@ -343,7 +338,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);