X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=82f438cdbf02112ff3362018b7587b066f251fbd;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=9ed1e634ff4e6c0f214d3dd9aaeebec941d8cb23;hpb=6065f6622cc275dc0b20baaf7c267e71169d18f3;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 9ed1e634..82f438cd 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -1,7 +1,6 @@
 #include <cstring>
 #include <set>
 #include <msp/core/algorithm.h>
-#include <msp/core/hash.h>
 #include <msp/core/maputils.h>
 #include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_es2_compatibility.h>
@@ -16,10 +15,8 @@
 #include <msp/gl/extensions/khr_debug.h>
 #include <msp/gl/extensions/nv_non_square_matrices.h>
 #include <msp/io/print.h>
-#include <msp/strings/format.h>
 #include "buffer.h"
 #include "error.h"
-#include "misc.h"
 #include "program.h"
 #include "resources.h"
 #include "glsl/compiler.h"
@@ -162,16 +159,18 @@ void Program::add_glsl_stages(const GlslModule &mod, const map<string, int> &spe
 void Program::compile_glsl_stage(unsigned stage_id)
 {
 	glCompileShader(stage_id);
-	bool compiled = get_shader_i(stage_id, GL_COMPILE_STATUS);
+	int status = 0;
+	glGetShaderiv(stage_id, GL_COMPILE_STATUS, &status);
 
-	GLsizei info_log_len = get_shader_i(stage_id, GL_INFO_LOG_LENGTH);
+	int info_log_len = 0;
+	glGetShaderiv(stage_id, GL_INFO_LOG_LENGTH, &info_log_len);
 	string info_log(info_log_len+1, 0);
 	glGetShaderInfoLog(stage_id, info_log_len+1, &info_log_len, &info_log[0]);
 	info_log.erase(info_log_len);
 	if(module && module->get_format()==Module::GLSL)
 		info_log = static_cast<const GlslModule *>(module)->get_source_map().translate_errors(info_log);
 
-	if(!compiled)
+	if(!status)
 		throw compile_error(info_log);
 #ifdef DEBUG
 	if(!info_log.empty())
@@ -235,14 +234,15 @@ void Program::link()
 	if(!has_stages())
 		throw invalid_operation("Program::link");
 
-	uniforms.clear();
-	uniform_blocks.clear();
-	attributes.clear();
+	reflect_data = ReflectData();
 
 	glLinkProgram(id);
-	linked = get_program_i(id, GL_LINK_STATUS);
+	int status = 0;
+	glGetProgramiv(id, GL_LINK_STATUS, &status);
+	linked = status;
 
-	GLsizei info_log_len = get_program_i(id, GL_INFO_LOG_LENGTH);
+	int info_log_len = 0;
+	glGetProgramiv(id, GL_INFO_LOG_LENGTH, &info_log_len);
 	string info_log(info_log_len+1, 0);
 	glGetProgramInfoLog(id, info_log_len+1, &info_log_len, &info_log[0]);
 	info_log.erase(info_log_len);
@@ -262,13 +262,13 @@ void Program::link()
 		query_attributes();
 		if(transient)
 		{
-			for(unsigned i=0; i<uniform_blocks.size(); ++i)
+			for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
 			{
-				auto j = transient->blocks.find(uniform_blocks[i].name);
+				auto j = transient->blocks.find(reflect_data.uniform_blocks[i].name);
 				if(j!=transient->blocks.end())
 				{
 					glUniformBlockBinding(id, i, j->second);
-					uniform_blocks[i].bind_point = j->second;
+					reflect_data.uniform_blocks[i].bind_point = j->second;
 				}
 			}
 
@@ -296,16 +296,17 @@ void Program::link()
 	delete transient;
 	transient = 0;
 
-	for(const UniformInfo &u: uniforms)
+	for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
 		require_type(u.type);
-	for(const AttributeInfo &a: attributes)
+	for(const ReflectData::AttributeInfo &a: reflect_data.attributes)
 		require_type(a.type);
 }
 
 void Program::query_uniforms()
 {
-	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
-	uniforms.reserve(count);
+	unsigned count = 0;
+	glGetProgramiv(id, GL_ACTIVE_UNIFORMS, reinterpret_cast<int *>(&count));
+	reflect_data.uniforms.reserve(count);
 	vector<string> uniform_names(count);
 	for(unsigned i=0; i<count; ++i)
 	{
@@ -321,8 +322,8 @@ void Program::query_uniforms()
 			if(len>3 && !strcmp(name+len-3, "[0]"))
 				name[len-3] = 0;
 
-			uniforms.push_back(UniformInfo());
-			UniformInfo &info = uniforms.back();
+			reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+			ReflectData::UniformInfo &info = reflect_data.uniforms.back();
 			info.name = name;
 			info.tag = name;
 			info.array_size = size;
@@ -331,22 +332,22 @@ void Program::query_uniforms()
 		}
 	}
 
-	sort_member(uniforms, &UniformInfo::tag);
+	sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
 
 	if(ARB_uniform_buffer_object)
 	{
-		vector<UniformInfo *> uniforms_by_index(count);
+		vector<ReflectData::UniformInfo *> uniforms_by_index(count);
 		for(unsigned i=0; i<count; ++i)
 			if(!uniform_names[i].empty())
 				// The element is already known to be present
-				uniforms_by_index[i] = &*lower_bound_member(uniforms, Tag(uniform_names[i]), &UniformInfo::tag);
+				uniforms_by_index[i] = &*lower_bound_member(reflect_data.uniforms, Tag(uniform_names[i]), &ReflectData::UniformInfo::tag);
 		query_uniform_blocks(uniforms_by_index);
 	}
 
-	uniform_blocks.push_back(UniformBlockInfo());
-	UniformBlockInfo &default_block = uniform_blocks.back();
+	reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+	ReflectData::UniformBlockInfo &default_block = reflect_data.uniform_blocks.back();
 
-	for(UniformInfo &u: uniforms)
+	for(ReflectData::UniformInfo &u: reflect_data.uniforms)
 		if(!u.block)
 		{
 			u.location = glGetUniformLocation(id, u.name.c_str());
@@ -357,23 +358,23 @@ void Program::query_uniforms()
 				glGetUniformiv(id, u.location, &u.binding);
 		}
 
-	default_block.layout_hash = compute_layout_hash(default_block.uniforms);
-
-	update_layout_hash();
+	default_block.update_layout_hash();
+	reflect_data.update_layout_hash();
 }
 
-void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_index)
+void Program::query_uniform_blocks(const vector<ReflectData::UniformInfo *> &uniforms_by_index)
 {
-	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
+	unsigned count = 0;
+	glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, reinterpret_cast<int *>(&count));
 	// Reserve an extra index for the default block
-	uniform_blocks.reserve(count+1);
+	reflect_data.uniform_blocks.reserve(count+1);
 	for(unsigned i=0; i<count; ++i)
 	{
 		char name[128];
 		int len;
 		glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
-		uniform_blocks.push_back(UniformBlockInfo());
-		UniformBlockInfo &info = uniform_blocks.back();
+		reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+		ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
 		info.name = name;
 
 		int value;
@@ -425,15 +426,16 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 				uniforms_by_index[query_indices[j]]->matrix_stride = values[j];
 		}
 
-		sort(info.uniforms, uniform_location_compare);
-		info.layout_hash = compute_layout_hash(info.uniforms);
+		info.sort_uniforms();
+		info.update_layout_hash();
 	}
 }
 
 void Program::query_attributes()
 {
-	unsigned count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
-	attributes.reserve(count);
+	unsigned count = 0;
+	glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, reinterpret_cast<int *>(&count));
+	reflect_data.attributes.reserve(count);
 	for(unsigned i=0; i<count; ++i)
 	{
 		char name[128];
@@ -446,8 +448,8 @@ void Program::query_attributes()
 			if(len>3 && !strcmp(name+len-3, "[0]"))
 				name[len-3] = 0;
 
-			attributes.push_back(AttributeInfo());
-			AttributeInfo &info = attributes.back();
+			reflect_data.attributes.push_back(ReflectData::AttributeInfo());
+			ReflectData::AttributeInfo &info = reflect_data.attributes.back();
 			info.name = name;
 			info.location = glGetAttribLocation(id, name);
 			info.array_size = size;
@@ -461,15 +463,15 @@ void Program::collect_uniforms()
 	const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
 
 	// Prepare the default block
-	uniform_blocks.push_back(UniformBlockInfo());
+	reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
 	vector<vector<string> > block_uniform_names(1);
 
 	for(const SpirVModule::Variable &v: mod.get_variables())
 	{
 		if(v.storage==SpirVModule::UNIFORM && v.struct_type)
 		{
-			uniform_blocks.push_back(UniformBlockInfo());
-			UniformBlockInfo &info = uniform_blocks.back();
+			reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+			ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
 			info.name = v.struct_type->name;
 			info.bind_point = v.binding;
 			info.data_size = v.struct_type->size;
@@ -483,8 +485,8 @@ void Program::collect_uniforms()
 		else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
 		{
 			block_uniform_names[0].push_back(v.name);
-			uniforms.push_back(UniformInfo());
-			UniformInfo &info = uniforms.back();
+			reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+			ReflectData::UniformInfo &info = reflect_data.uniforms.back();
 			info.name = v.name;
 			info.tag = v.name;
 			info.location = v.location;
@@ -494,23 +496,23 @@ void Program::collect_uniforms()
 		}
 	}
 
-	sort_member(uniforms, &UniformInfo::tag);
+	sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
 
-	for(unsigned i=0; i<uniform_blocks.size(); ++i)
+	for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
 	{
-		UniformBlockInfo &block = uniform_blocks[i];
+		ReflectData::UniformBlockInfo &block = reflect_data.uniform_blocks[i];
 		for(const string &n: block_uniform_names[i])
 		{
 			// The element is already known to be present
-			UniformInfo &uni = *lower_bound_member(uniforms, Tag(n), &UniformInfo::tag);
+			ReflectData::UniformInfo &uni = *lower_bound_member(reflect_data.uniforms, Tag(n), &ReflectData::UniformInfo::tag);
 			block.uniforms.push_back(&uni);
 			uni.block = &block;
 		}
-		sort(block.uniforms, uniform_location_compare);
-		block.layout_hash = compute_layout_hash(block.uniforms);
+		block.sort_uniforms();
+		block.update_layout_hash();
 	}
 
-	update_layout_hash();
+	reflect_data.update_layout_hash();
 }
 
 void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
@@ -544,8 +546,8 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const
 		{
 			string name = prefix+m.name;
 			uniform_names.push_back(name);
-			uniforms.push_back(UniformInfo());
-			UniformInfo &info = uniforms.back();
+			reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+			ReflectData::UniformInfo &info = reflect_data.uniforms.back();
 			info.name = name;
 			info.tag = name;
 			info.offset = offset;
@@ -567,8 +569,8 @@ void Program::collect_attributes()
 			for(const SpirVModule::Variable *v: e.globals)
 				if(v->storage==SpirVModule::INPUT)
 				{
-					attributes.push_back(AttributeInfo());
-					AttributeInfo &info = attributes.back();
+					reflect_data.attributes.push_back(ReflectData::AttributeInfo());
+					ReflectData::AttributeInfo &info = reflect_data.attributes.back();
 					info.name = v->name;
 					info.location = v->location;
 					info.array_size = v->array_size;
@@ -577,47 +579,26 @@ void Program::collect_attributes()
 		}
 }
 
-void Program::update_layout_hash()
-{
-	string layout_descriptor;
-	for(const UniformBlockInfo &b: uniform_blocks)
-		layout_descriptor += format("%d:%x\n", b.bind_point, b.layout_hash);
-	uniform_layout_hash = hash32(layout_descriptor);
-}
-
-Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo *> &uniforms)
-{
-	string layout_descriptor;
-	for(const UniformInfo *u: uniforms)
-		layout_descriptor += format("%d:%s:%x:%d\n", u->location, u->name, u->type, u->array_size);
-	return hash32(layout_descriptor);
-}
-
-bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInfo *uni2)
-{
-	return uni1->location<uni2->location;
-}
-
-const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const
+const ReflectData::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const
 {
-	auto i = find_member(uniform_blocks, name, &UniformBlockInfo::name);
-	if(i==uniform_blocks.end())
+	auto i = find_member(reflect_data.uniform_blocks, name, &ReflectData::UniformBlockInfo::name);
+	if(i==reflect_data.uniform_blocks.end())
 		throw key_error(name);
 	return *i;
 }
 
-const Program::UniformInfo &Program::get_uniform_info(const string &name) const
+const ReflectData::UniformInfo &Program::get_uniform_info(const string &name) const
 {
-	auto i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
-	if(i==uniforms.end() || i->name!=name)
+	auto i = lower_bound_member(reflect_data.uniforms, Tag(name), &ReflectData::UniformInfo::tag);
+	if(i==reflect_data.uniforms.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
 }
 
-const Program::UniformInfo &Program::get_uniform_info(Tag tag) const
+const ReflectData::UniformInfo &Program::get_uniform_info(Tag tag) const
 {
-	auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
-	if(i==uniforms.end() || i->tag!=tag)
+	auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag);
+	if(i==reflect_data.uniforms.end() || i->tag!=tag)
 		throw key_error(tag);
 	return *i;
 }
@@ -627,26 +608,26 @@ int Program::get_uniform_location(const string &name) const
 	if(name[name.size()-1]==']')
 		throw invalid_argument("Program::get_uniform_location");
 
-	auto i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
-	return i!=uniforms.end() && i->name==name && i->block->bind_point<0 ? i->location : -1;
+	auto i = lower_bound_member(reflect_data.uniforms, Tag(name), &ReflectData::UniformInfo::tag);
+	return i!=reflect_data.uniforms.end() && i->name==name && i->block->bind_point<0 ? i->location : -1;
 }
 
 int Program::get_uniform_location(Tag tag) const
 {
-	auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
-	return i!=uniforms.end() && i->tag==tag && i->block->bind_point<0 ? i->location : -1;
+	auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag);
+	return i!=reflect_data.uniforms.end() && i->tag==tag && i->block->bind_point<0 ? i->location : -1;
 }
 
 int Program::get_uniform_binding(Tag tag) const
 {
-	auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
-	return i!=uniforms.end() && i->tag==tag ? i->binding : -1;
+	auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag);
+	return i!=reflect_data.uniforms.end() && i->tag==tag ? i->binding : -1;
 }
 
-const Program::AttributeInfo &Program::get_attribute_info(const string &name) const
+const ReflectData::AttributeInfo &Program::get_attribute_info(const string &name) const
 {
-	auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
-	if(i==attributes.end() || i->name!=name)
+	auto i = lower_bound_member(reflect_data.attributes, name, &ReflectData::AttributeInfo::name);
+	if(i==reflect_data.attributes.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
 }
@@ -656,8 +637,8 @@ int Program::get_attribute_location(const string &name) const
 	if(name[name.size()-1]==']')
 		throw invalid_argument("Program::get_attribute_location");
 
-	auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
-	return i!=attributes.end() && i->name==name ? i->location : -1;
+	auto i = lower_bound_member(reflect_data.attributes, name, &ReflectData::AttributeInfo::name);
+	return i!=reflect_data.attributes.end() && i->name==name ? i->location : -1;
 }
 
 void Program::set_debug_name(const string &name)
@@ -688,31 +669,6 @@ void Program::set_stage_debug_name(unsigned stage_id, Stage type)
 }
 
 
-Program::UniformInfo::UniformInfo():
-	block(0),
-	location(-1),
-	array_size(0),
-	array_stride(0),
-	matrix_stride(0),
-	type(VOID),
-	binding(-1)
-{ }
-
-
-Program::UniformBlockInfo::UniformBlockInfo():
-	data_size(0),
-	bind_point(-1),
-	layout_hash(0)
-{ }
-
-
-Program::AttributeInfo::AttributeInfo():
-	location(-1),
-	array_size(0),
-	type(VOID)
-{ }
-
-
 Program::Loader::Loader(Program &p, Collection &c):
 	DataFile::CollectionObjectLoader<Program>(p, &c)
 {