X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Fprogramdata.cpp;h=43bcbf3febea57702fb6be343818b01d9d472325;hp=65934d382ae29fad792c0b67031a406658b7b3fb;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=1b23728908f5ec9beb08b2b70737c3903745fddc

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 65934d38..43bcbf3f 100644
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -1,7 +1,5 @@
 #include <msp/core/algorithm.h>
-#include <msp/core/maputils.h>
 #include <msp/debug/demangle.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/io/print.h>
 #include "buffer.h"
 #include "color.h"
@@ -10,7 +8,6 @@
 #include "pipelinestate.h"
 #include "program.h"
 #include "programdata.h"
-#include "uniform.h"
 #include "uniformblock.h"
 #include "vector.h"
 
@@ -31,14 +28,12 @@ ProgramData::ProgramData(const Program *p):
 ProgramData::ProgramData(const ProgramData &other):
 	tied_program(other.tied_program),
 	uniforms(other.uniforms),
+	uniform_data(other.uniform_data),
 	generation(other.generation),
 	last_buffer_block(0),
 	buffer(0),
 	dirty(0)
-{
-	for(TaggedUniform &u: uniforms)
-		u.value = u.value->clone();
-}
+{ }
 
 ProgramData::ProgramData(const ProgramData &other, const Program *p):
 	tied_program(p),
@@ -53,8 +48,7 @@ ProgramData::ProgramData(const ProgramData &other, const Program *p):
 	}
 
 	uniforms = other.uniforms;
-	for(TaggedUniform &u: uniforms)
-		u.value = u.value->clone();
+	uniform_data = other.uniform_data;
 }
 
 ProgramData &ProgramData::operator=(const ProgramData &other)
@@ -62,8 +56,7 @@ ProgramData &ProgramData::operator=(const ProgramData &other)
 	tied_program = other.tied_program;
 
 	uniforms = other.uniforms;
-	for(TaggedUniform &u: uniforms)
-		u.value = u.value->clone();
+	uniform_data = other.uniform_data;
 
 	for(SharedBlock &b: blocks)
 		delete b.block;
@@ -79,8 +72,6 @@ ProgramData &ProgramData::operator=(const ProgramData &other)
 
 ProgramData::~ProgramData()
 {
-	for(TaggedUniform &u: uniforms)
-		delete u.value;
 	for(SharedBlock &b: blocks)
 	{
 		if(b.indices.type_flag==0xFE)
@@ -90,65 +81,47 @@ ProgramData::~ProgramData()
 	delete buffer;
 }
 
-void ProgramData::uniform(Tag tag, Uniform *uni)
+void ProgramData::uniform(Tag tag, DataType type, unsigned array_size, const void *value)
 {
-	try
+	if(!validate_tag(tag))
+		return;
+
+	auto i = lower_bound_member(uniforms, tag, &TaggedUniform::tag);
+	if(i==uniforms.end() || i->tag!=tag)
 	{
-		if(!validate_tag(tag))
-		{
-			delete uni;
-			return;
-		}
+		if(uniforms.size()>=MASK_BITS)
+			throw too_many_uniforms(tag.str());
+
+		TaggedUniform tu;
+		tu.tag = tag;
+		tu.type = type;
+		tu.array_size = array_size;
+		tu.data_offset = uniform_data.size();
+		tu.data_size = array_size*get_type_size(type);
+		i = uniforms.insert(i, tu);
+		uniform_data.resize(tu.data_offset+tu.data_size);
+
+		mark_dirty(ALL_ONES);
 	}
-	catch(...)
+	else if(type!=i->type)
+		throw invalid_operation("ProgramData::uniform");
+	else if(array_size>i->array_size)
 	{
-		delete uni;
-		throw;
+		unsigned add_bytes = (array_size-i->array_size)*get_type_size(type);
+		uniform_data.insert(uniform_data.begin()+i->data_offset+i->data_size, add_bytes, 0);
+		for(TaggedUniform &u: uniforms)
+			if(u.data_offset>i->data_offset)
+				u.data_offset += add_bytes;
+		i->array_size = array_size;
+		i->data_size = array_size*get_type_size(type);
 	}
 
-	int i = find_uniform_index(tag);
-	if(i<0)
-		return add_uniform(tag, uni);
-
-	uniforms[i].replace_value(uni);
-	mark_dirty(1<<i);
-}
-
-template<typename T, typename V>
-void ProgramData::uniform(Tag tag, V value)
-{
-	if(!validate_tag(tag))
-		return;
-
-	int i = find_uniform_index(tag);
-	if(i<0)
-		return add_uniform(tag, new T(value));
-
-	if(T *uni = dynamic_cast<T *>(uniforms[i].value))
-		uni->set(value);
-	else
-		uniforms[i].replace_value(new T(value));
+	const char *val_begin = static_cast<const char *>(value);
+	const char *val_end = val_begin+array_size*get_type_size(type);
+	char *store_begin = uniform_data.data()+i->data_offset;
+	copy(val_begin, val_end, store_begin);
 
-	mark_dirty(1<<i);
-}
-
-template<typename T, typename V>
-void ProgramData::uniform_array(Tag tag, unsigned n, V value)
-{
-	if(!validate_tag(tag))
-		return;
-
-	int i = find_uniform_index(tag);
-	if(i<0)
-		return add_uniform(tag, new UniformArray<T>(n, value));
-
-	UniformArray<T> *uni = dynamic_cast<UniformArray<T> *>(uniforms[i].value);
-	if(uni && n==uni->size())
-		uni->set(value);
-	else
-		uniforms[i].replace_value(new UniformArray<T>(n, value));
-
-	mark_dirty(1<<i);
+	mark_dirty(1<<(i-uniforms.begin()));
 }
 
 bool ProgramData::validate_tag(Tag tag) const
@@ -174,24 +147,6 @@ bool ProgramData::validate_tag(Tag tag) const
 #endif
 }
 
-void ProgramData::add_uniform(Tag tag, Uniform *uni)
-{
-	if(uniforms.size()>=MASK_BITS)
-	{
-		delete uni;
-		throw too_many_uniforms(tag.str());
-	}
-
-	auto j = lower_bound_member(uniforms, tag, &TaggedUniform::tag);
-
-	TaggedUniform nu;
-	nu.tag = tag;
-	nu.value = uni;
-	uniforms.insert(j, nu);
-
-	mark_dirty(ALL_ONES);
-}
-
 void ProgramData::mark_dirty(Mask bits)
 {
 	if(!dirty)
@@ -199,19 +154,14 @@ void ProgramData::mark_dirty(Mask bits)
 	dirty |= bits;
 }
 
-void ProgramData::uniform(Tag tag, const Uniform &u)
-{
-	uniform(tag, u.clone());
-}
-
 void ProgramData::uniform(Tag tag, int v)
 {
-	uniform<Uniform1i>(tag, v);
+	uniform(tag, INT, 1, &v);
 }
 
 void ProgramData::uniform(Tag tag, float v)
 {
-	uniform<Uniform1f>(tag, v);
+	uniform(tag, FLOAT, 1, &v);
 }
 
 void ProgramData::uniform(Tag tag, int v0, int v1)
@@ -228,12 +178,12 @@ void ProgramData::uniform(Tag tag, float v0, float v1)
 
 void ProgramData::uniform2(Tag tag, const int *v)
 {
-	uniform<Uniform2i>(tag, v);
+	uniform(tag, INT_VEC2, 1, v);
 }
 
 void ProgramData::uniform2(Tag tag, const float *v)
 {
-	uniform<Uniform2f>(tag, v);
+	uniform(tag, FLOAT_VEC2, 1, v);
 }
 
 void ProgramData::uniform(Tag tag, int v0, int v1, int v2)
@@ -250,12 +200,12 @@ void ProgramData::uniform(Tag tag, float v0, float v1, float v2)
 
 void ProgramData::uniform3(Tag tag, const int *v)
 {
-	uniform<Uniform3i>(tag, v);
+	uniform(tag, INT_VEC3, 1, v);
 }
 
 void ProgramData::uniform3(Tag tag, const float *v)
 {
-	uniform<Uniform3f>(tag, v);
+	uniform(tag, FLOAT_VEC3, 1, v);
 }
 
 void ProgramData::uniform(Tag tag, int v0, int v1, int v2, int v3)
@@ -277,52 +227,52 @@ void ProgramData::uniform(Tag tag, const Color &c)
 
 void ProgramData::uniform4(Tag tag, const int *v)
 {
-	uniform<Uniform4i>(tag, v);
+	uniform(tag, INT_VEC4, 1, v);
 }
 
 void ProgramData::uniform4(Tag tag, const float *v)
 {
-	uniform<Uniform4f>(tag, v);
+	uniform(tag, FLOAT_VEC4, 1, v);
 }
 
 void ProgramData::uniform_matrix2(Tag tag, const float *v)
 {
-	uniform<UniformMatrix2x2f>(tag, v);
+	uniform(tag, FLOAT_MAT2, 1, v);
 }
 
 void ProgramData::uniform_matrix3x2(Tag tag, const float *v)
 {
-	uniform<UniformMatrix3x2f>(tag, v);
+	uniform(tag, FLOAT_MAT3x2, 1, v);
 }
 
 void ProgramData::uniform_matrix4x2(Tag tag, const float *v)
 {
-	uniform<UniformMatrix4x2f>(tag, v);
+	uniform(tag, FLOAT_MAT4x2, 1, v);
 }
 
 void ProgramData::uniform_matrix2x3(Tag tag, const float *v)
 {
-	uniform<UniformMatrix2x3f>(tag, v);
+	uniform(tag, FLOAT_MAT2x3, 1, v);
 }
 
 void ProgramData::uniform_matrix3(Tag tag, const float *v)
 {
-	uniform<UniformMatrix3x3f>(tag, v);
+	uniform(tag, FLOAT_MAT3, 1, v);
 }
 
 void ProgramData::uniform_matrix4x3(Tag tag, const float *v)
 {
-	uniform<UniformMatrix4x3f>(tag, v);
+	uniform(tag, FLOAT_MAT4x3, 1, v);
 }
 
 void ProgramData::uniform_matrix2x4(Tag tag, const float *v)
 {
-	uniform<UniformMatrix2x4f>(tag, v);
+	uniform(tag, FLOAT_MAT2x4, 1, v);
 }
 
 void ProgramData::uniform_matrix3x4(Tag tag, const float *v)
 {
-	uniform<UniformMatrix3x4f>(tag, v);
+	uniform(tag, FLOAT_MAT3x4, 1, v);
 }
 
 void ProgramData::uniform(Tag tag, const Matrix &m)
@@ -332,102 +282,102 @@ void ProgramData::uniform(Tag tag, const Matrix &m)
 
 void ProgramData::uniform_matrix4(Tag tag, const float *v)
 {
-	uniform<UniformMatrix4x4f>(tag, v);
+	uniform(tag, FLOAT_MAT4, 1, v);
 }
 
 void ProgramData::uniform_array(Tag tag, unsigned n, const int *v)
 {
-	uniform_array<Uniform1i>(tag, n, v);
+	uniform(tag, INT, n, v);
 }
 
 void ProgramData::uniform_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<Uniform1f>(tag, n, v);
+	uniform(tag, FLOAT, n, v);
 }
 
 void ProgramData::uniform1_array(Tag tag, unsigned n, const int *v)
 {
-	uniform_array<Uniform1i>(tag, n, v);
+	uniform(tag, INT, n, v);
 }
 
 void ProgramData::uniform1_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<Uniform1f>(tag, n, v);
+	uniform(tag, FLOAT, n, v);
 }
 
 void ProgramData::uniform2_array(Tag tag, unsigned n, const int *v)
 {
-	uniform_array<Uniform2i>(tag, n, v);
+	uniform(tag, INT_VEC2, n, v);
 }
 
 void ProgramData::uniform2_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<Uniform2f>(tag, n, v);
+	uniform(tag, FLOAT_VEC2, n, v);
 }
 
 void ProgramData::uniform3_array(Tag tag, unsigned n, const int *v)
 {
-	uniform_array<Uniform3i>(tag, n, v);
+	uniform(tag, INT_VEC3, n, v);
 }
 
 void ProgramData::uniform3_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<Uniform3f>(tag, n, v);
+	uniform(tag, FLOAT_VEC3, n, v);
 }
 
 void ProgramData::uniform4_array(Tag tag, unsigned n, const int *v)
 {
-	uniform_array<Uniform4i>(tag, n, v);
+	uniform(tag, INT_VEC4, n, v);
 }
 
 void ProgramData::uniform4_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<Uniform4f>(tag, n, v);
+	uniform(tag, FLOAT_VEC4, n, v);
 }
 
 void ProgramData::uniform_matrix2_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix2x2f>(tag, n, v);
+	uniform(tag, FLOAT_MAT2, n, v);
 }
 
 void ProgramData::uniform_matrix3x2_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix3x2f>(tag, n, v);
+	uniform(tag, FLOAT_MAT3x2, n, v);
 }
 
 void ProgramData::uniform_matrix4x2_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix4x2f>(tag, n, v);
+	uniform(tag, FLOAT_MAT4x2, n, v);
 }
 
 void ProgramData::uniform_matrix2x3_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix2x3f>(tag, n, v);
+	uniform(tag, FLOAT_MAT2x3, n, v);
 }
 
 void ProgramData::uniform_matrix3_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix3x3f>(tag, n, v);
+	uniform(tag, FLOAT_MAT3, n, v);
 }
 
 void ProgramData::uniform_matrix4x3_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix4x3f>(tag, n, v);
+	uniform(tag, FLOAT_MAT4x3, n, v);
 }
 
 void ProgramData::uniform_matrix2x4_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix2x4f>(tag, n, v);
+	uniform(tag, FLOAT_MAT2x4, n, v);
 }
 
 void ProgramData::uniform_matrix3x4_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix3x4f>(tag, n, v);
+	uniform(tag, FLOAT_MAT3x4, n, v);
 }
 
 void ProgramData::uniform_matrix4_array(Tag tag, unsigned n, const float *v)
 {
-	uniform_array<UniformMatrix4x4f>(tag, n, v);
+	uniform(tag, FLOAT_MAT4, n, v);
 }
 
 void ProgramData::remove_uniform(Tag tag)
@@ -436,7 +386,10 @@ void ProgramData::remove_uniform(Tag tag)
 	if(i==uniforms.end() || i->tag!=tag)
 		return;
 
-	delete i->value;
+	uniform_data.erase(uniform_data.begin()+i->data_offset, uniform_data.begin()+i->data_offset+i->data_size);
+	for(TaggedUniform &u: uniforms)
+		if(u.data_offset>i->data_offset)
+			u.data_offset -= i->data_size;
 	uniforms.erase(i);
 
 	mark_dirty(ALL_ONES);
@@ -451,18 +404,13 @@ vector<Tag> ProgramData::get_uniform_tags() const
 	return tags;
 }
 
-const Uniform &ProgramData::get_uniform(Tag tag) const
+void ProgramData::copy_uniform(const ProgramData &source, Tag tag)
 {
-	int i = find_uniform_index(tag);
+	int i = source.find_uniform_index(tag);
 	if(i<0)
 		throw key_error(tag);
-	return *uniforms[i].value;
-}
-
-const Uniform *ProgramData::find_uniform(Tag tag) const
-{
-	int i = find_uniform_index(tag);
-	return (i>=0 ? uniforms[i].value : 0);
+	const TaggedUniform &tu = source.uniforms[i];
+	uniform(tag, tu.type, tu.array_size, source.uniform_data.data()+tu.data_offset);
 }
 
 int ProgramData::find_uniform_index(Tag tag) const
@@ -564,6 +512,7 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Reflect
 
 	if(block.used && !block.block)
 	{
+		block.block = new UniformBlock(info);
 		if(info.bind_point>=0)
 		{
 			if(!buffer)
@@ -576,13 +525,9 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Reflect
 #endif
 			}
 
-			BufferBackedUniformBlock *bb_block = new BufferBackedUniformBlock(info.data_size);
-			block.block = bb_block;
-			bb_block->use_buffer(buffer, last_buffer_block);
-			last_buffer_block = bb_block;
+			block.block->use_buffer(buffer, last_buffer_block);
+			last_buffer_block = block.block;
 		}
-		else
-			block.block = new DefaultUniformBlock;
 	}
 }
 
@@ -594,13 +539,16 @@ void ProgramData::update_block(SharedBlock &block, const ReflectData::UniformBlo
 		if(is_image(info.uniforms[i]->type))
 			;  // Temporarily ignore deprecated use of sampler uniforms in ProgramData
 		else if(indices[i]!=0xFF)
-			block.block->attach(*info.uniforms[i], *uniforms[indices[i]].value);
+		{
+			const TaggedUniform &tu = uniforms[indices[i]];
+			block.block->store(*info.uniforms[i], tu.array_size, uniform_data.data()+tu.data_offset);
+		}
 	}
 }
 
 vector<ProgramData::ProgramBlock>::const_iterator ProgramData::prepare_program(const Program &prog) const
 {
-	BufferBackedUniformBlock *old_last_block = last_buffer_block;
+	UniformBlock *old_last_block = last_buffer_block;
 	auto prog_begin = get_program(prog);
 
 	Mask force_dirty = (dirty==ALL_ONES ? ALL_ONES : 0U);
@@ -688,14 +636,9 @@ void ProgramData::apply(const Program &prog, PipelineState &state) const
 	for(auto i=prog_begin+1; (i!=programs.end() && i->prog_hash==prog_hash); ++i)
 		if(i->block)
 		{
-			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);
-			}
+			state.set_uniform_block(i->bind_point, i->block);
+			if(i->bind_point>=0)
+				i->block->refresh();
 		}
 }
 
@@ -711,20 +654,6 @@ void ProgramData::set_debug_name(const string &name)
 }
 
 
-ProgramData::TaggedUniform::TaggedUniform():
-	value(0)
-{ }
-
-void ProgramData::TaggedUniform::replace_value(Uniform *v)
-{
-	/* UniformBlock does not copy the uniforms, so existing default blocks
-	will be left with stale pointers.  This is not a problem as long as no
-	one stores pointers to the blocks and expects them to stay valid. */
-	delete value;
-	value = v;
-}
-
-
 ProgramData::SharedBlock::SharedBlock(ReflectData::LayoutHash h):
 	block_hash(h),
 	used(0),