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

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 4133b9ac..79b55901 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -7,6 +7,7 @@
 #include "color.h"
 #include "error.h"
 #include "matrix.h"
+#include "pipelinestate.h"
 #include "program.h"
 #include "programdata.h"
 #include "uniform.h"
@@ -566,7 +567,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())
@@ -596,15 +597,10 @@ void ProgramData::update_block(SharedBlock &block, const Program::UniformBlockIn
 	}
 }
 
-void ProgramData::apply() const
+vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(const Program &prog) const
 {
-	const Program *prog = Program::current();
-	if(!prog)
-		throw invalid_operation("ProgramData::apply");
-
 	BufferBackedUniformBlock *old_last_block = last_buffer_block;
-	vector<ProgramBlock>::iterator prog_begin = get_program(*prog);
-	Program::LayoutHash prog_hash = prog->get_uniform_layout_hash();
+	vector<ProgramBlock>::iterator prog_begin = get_program(prog);
 
 	Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
 	Mask affected = (dirty&prog_begin->masks.used) | force_dirty;
@@ -623,7 +619,7 @@ void ProgramData::apply() const
 			dirty = 0;
 		}
 
-		const vector<Program::UniformBlockInfo> &block_infos = prog->get_uniform_blocks();
+		const vector<Program::UniformBlockInfo> &block_infos = prog.get_uniform_blocks();
 
 		if(prog_begin->masks.dirty==ALL_ONES)
 		{
@@ -657,11 +653,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 +661,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
@@ -684,9 +675,25 @@ void ProgramData::apply() const
 		}
 	}
 
-	for(vector<ProgramBlock>::iterator i=prog_begin+1; (i!=programs.end() && i->prog_hash==prog_hash); ++i)
+	return prog_begin;
+}
+
+void ProgramData::apply(const Program &prog, PipelineState &state) const
+{
+	vector<ProgramBlock>::const_iterator prog_begin = prepare_program(prog);
+	Program::LayoutHash prog_hash = prog_begin->prog_hash;
+	for(vector<ProgramBlock>::const_iterator i=prog_begin+1; (i!=programs.end() && i->prog_hash==prog_hash); ++i)
 		if(i->block)
-			i->block->apply(i->bind_point);
+		{
+			if(i->bind_point<0)
+				state.set_uniforms(static_cast<const DefaultUniformBlock *>(i->block));
+			else
+			{
+				const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(i->block);
+				block->refresh();
+				state.set_uniform_block(i->bind_point, block);
+			}
+		}
 }
 
 void ProgramData::set_debug_name(const string &name)