X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=4b53b8fe2f28e7e812e605654d6d7d64ec695aeb;hb=ddb8e4ceea602d90ca7d9dc2637b9285610787bd;hp=7fff5859c1240ca724f8536f1d72e1e59e1511da;hpb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 7fff5859..4b53b8fe 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -3,7 +3,9 @@
 #include <set>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
+#include <msp/gl/extensions/arb_es2_compatibility.h>
 #include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_gl_spirv.h>
 #include <msp/gl/extensions/arb_geometry_shader4.h>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
@@ -15,7 +17,6 @@
 #include "buffer.h"
 #include "error.h"
 #include "misc.h"
-#include "module.h"
 #include "program.h"
 #include "resources.h"
 #include "shader.h"
@@ -35,7 +36,7 @@ Program::Program(const std::string &source)
 {
 	init();
 
-	Module mod;
+	GlslModule mod;
 	mod.set_source(source);
 	add_stages(mod);
 
@@ -73,17 +74,47 @@ void Program::init()
 
 Program::~Program()
 {
-	for(vector<unsigned>::iterator i=shader_ids.begin(); i!=shader_ids.end(); ++i)
+	for(vector<unsigned>::iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i)
 		glDeleteShader(*i);
 	glDeleteProgram(id);
 }
 
 void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
+{
+	if(!stage_ids.empty())
+		throw invalid_operation("Program::add_stages");
+
+	switch(mod.get_format())
+	{
+	case Module::GLSL: return add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);
+	case Module::SPIR_V: return add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values);
+	default: throw invalid_argument("Program::add_stages");
+	}
+}
+
+unsigned Program::add_stage(GLenum type)
+{
+	switch(type)
+	{
+	case GL_VERTEX_SHADER: { static Require _req(ARB_vertex_shader); } break;
+	case GL_GEOMETRY_SHADER: { static Require _req(ARB_geometry_shader4); } break;
+	case GL_FRAGMENT_SHADER: { static Require _req(ARB_fragment_shader); } break;
+	default: throw invalid_argument("Program::add_stage");
+	}
+
+	unsigned stage_id = glCreateShader(type);
+	stage_ids.push_back(stage_id);
+	glAttachShader(id, stage_id);
+
+	return stage_id;
+}
+
+void Program::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values)
 {
 	module = &mod;
 
 	SL::Compiler compiler;
-	compiler.set_source(module->get_prepared_source(), "<module>");
+	compiler.set_source(mod.get_prepared_source(), "<module>");
 	compiler.specialize(spec_values);
 	compiler.compile(SL::Compiler::PROGRAM);
 #ifdef DEBUG
@@ -95,29 +126,15 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 	vector<SL::Stage::Type> stages = compiler.get_stages();
 	for(vector<SL::Stage::Type>::const_iterator i=stages.begin(); i!=stages.end(); ++i)
 	{
-		GLenum type;
+		unsigned stage_id = 0;
 		switch(*i)
 		{
-		case SL::Stage::VERTEX:
-			{ static Require _req(ARB_vertex_shader); }
-			type = GL_VERTEX_SHADER;
-			break;
-		case SL::Stage::GEOMETRY:
-			{ static Require _req(ARB_geometry_shader4); }
-			type = GL_GEOMETRY_SHADER;
-			break;
-		case SL::Stage::FRAGMENT:
-			{ static Require _req(ARB_fragment_shader); }
-			type = GL_FRAGMENT_SHADER;
-			break;
-		default:
-			throw invalid_operation("Program::add_stages");
+		case SL::Stage::VERTEX: stage_id = add_stage(GL_VERTEX_SHADER); break;
+		case SL::Stage::GEOMETRY: stage_id = add_stage(GL_GEOMETRY_SHADER); break;
+		case SL::Stage::FRAGMENT: stage_id = add_stage(GL_FRAGMENT_SHADER); break;
+		default: throw invalid_operation("Program::add_glsl_stages");
 		}
 
-		unsigned stage_id = glCreateShader(type);
-		shader_ids.push_back(stage_id);
-		glAttachShader(id, stage_id);
-
 		string stage_src = compiler.get_stage_glsl(*i);
 		const char *src_ptr = stage_src.data();
 		int src_len = stage_src.size();
@@ -136,7 +153,77 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 			for(map<string, unsigned>::const_iterator j=frag_outs.begin(); j!=frag_outs.end(); ++j)
 				glBindFragDataLocation(id, j->second, j->first.c_str());
 		}
+
+		compile_glsl_stage(stage_id);
+	}
+}
+
+void Program::compile_glsl_stage(unsigned stage_id)
+{
+	glCompileShader(stage_id);
+	bool compiled = get_shader_i(stage_id, GL_COMPILE_STATUS);
+
+	GLsizei info_log_len = get_shader_i(stage_id, GL_INFO_LOG_LENGTH);
+	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)
+		throw compile_error(info_log);
+#ifdef DEBUG
+	if(!info_log.empty())
+		IO::print("Shader compile info log:\n%s", info_log);
+#endif
+}
+
+void Program::add_spirv_stages(const SpirVModule &mod, const map<string, int> &spec_values)
+{
+	static Require _req(ARB_gl_spirv);
+	static Require _req2(ARB_ES2_compatibility);
+
+	module = &mod;
+
+	const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
+	std::set<SpirVModule::Stage> stages;
+	for(vector<SpirVModule::EntryPoint>::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i)
+	{
+		if(stages.count(i->stage))
+			throw invalid_argument("Program::add_spirv_stages");
+
+		switch(i->stage)
+		{
+		case SpirVModule::VERTEX: add_stage(GL_VERTEX_SHADER); break;
+		case SpirVModule::GEOMETRY: add_stage(GL_GEOMETRY_SHADER); break;
+		case SpirVModule::FRAGMENT: add_stage(GL_FRAGMENT_SHADER); break;
+		default: throw invalid_operation("Program::add_spirv_stages");
+		}
+
+		stages.insert(i->stage);
 	}
+
+	const vector<UInt32> &code = mod.get_code();
+	glShaderBinary(stage_ids.size(), &stage_ids[0], GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4);
+
+	const vector<SpirVModule::SpecConstant> &spec_consts = mod.get_spec_constants();
+	vector<unsigned> spec_id_array;
+	vector<unsigned> spec_value_array;
+	spec_id_array.reserve(spec_consts.size());
+	spec_value_array.reserve(spec_consts.size());
+	for(vector<SpirVModule::SpecConstant>::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i)
+	{
+		map<string, int>::const_iterator j = spec_values.find(i->name);
+		if(j!=spec_values.end())
+		{
+			spec_id_array.push_back(i->constant_id);
+			spec_value_array.push_back(j->second);
+		}
+	}
+
+	vector<SpirVModule::EntryPoint>::const_iterator j=entry_points.begin();
+	for(vector<unsigned>::const_iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i, ++j)
+		glSpecializeShader(*i, j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
 }
 
 #pragma GCC diagnostic push
@@ -146,7 +233,8 @@ void Program::attach_shader(Shader &shader)
 	unsigned shader_id = shader.steal_id();
 	if(!shader_id)
 		throw invalid_argument("Program::attach_shader");
-	shader_ids.push_back(shader_id);
+	stage_ids.push_back(shader_id);
+	compile_glsl_stage(shader_id);
 }
 
 void Program::attach_shader_owned(Shader *shader)
@@ -185,26 +273,12 @@ void Program::bind_fragment_data(unsigned index, const string &name)
 
 void Program::link()
 {
-	for(vector<unsigned>::const_iterator i=shader_ids.begin(); i!=shader_ids.end(); ++i)
-	{
-		glCompileShader(*i);
-		bool compiled = get_shader_i(*i, GL_COMPILE_STATUS);
-
-		GLsizei info_log_len = get_shader_i(*i, GL_INFO_LOG_LENGTH);
-		string info_log(info_log_len+1, 0);
-		glGetShaderInfoLog(*i, info_log_len+1, &info_log_len, &info_log[0]);
-		info_log.erase(info_log_len);
-		info_log = module->get_source_map().translate_errors(info_log);
-
-		if(!compiled)
-			throw compile_error(info_log);
-#ifdef DEBUG
-		if(!info_log.empty())
-			IO::print("Shader compile info log:\n%s", info_log);
-#endif
-	}
+	if(stage_ids.empty())
+		throw invalid_operation("Program::link");
 
 	uniforms.clear();
+	uniform_blocks.clear();
+	attributes.clear();
 
 	glLinkProgram(id);
 	linked = get_program_i(id, GL_LINK_STATUS);
@@ -213,7 +287,8 @@ void Program::link()
 	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);
-	info_log = module->get_source_map().translate_errors(info_log);
+	if(module && module->get_format()==Module::GLSL)
+		info_log = static_cast<const GlslModule *>(module)->get_source_map().translate_errors(info_log);
 
 	if(!linked)
 		throw compile_error(info_log);
@@ -222,8 +297,16 @@ void Program::link()
 		IO::print("Program link info log:\n%s", info_log);
 #endif
 
-	query_uniforms();
-	query_attributes();
+	if(module->get_format()==Module::GLSL)
+	{
+		query_uniforms();
+		query_attributes();
+	}
+	else if(module->get_format()==Module::SPIR_V)
+	{
+		collect_uniforms();
+		collect_attributes();
+	}
 
 	for(UniformMap::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
 		require_type(i->second.type);
@@ -231,21 +314,6 @@ void Program::link()
 		require_type(i->second.type);
 }
 
-void Program::require_type(GLenum t)
-{
-	switch(t)
-	{
-	case GL_FLOAT_MAT2x3:
-	case GL_FLOAT_MAT2x4:
-	case GL_FLOAT_MAT3x2:
-	case GL_FLOAT_MAT3x4:
-	case GL_FLOAT_MAT4x2:
-	case GL_FLOAT_MAT4x3:
-		{ static Require _req(NV_non_square_matrices); }
-		break;
-	}
-}
-
 void Program::query_uniforms()
 {
 	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
@@ -265,12 +333,9 @@ void Program::query_uniforms()
 				name[len-3] = 0;
 
 			UniformInfo &info = uniforms[name];
-			info.block = 0;
 			info.name = name;
-			info.size = size;
-			info.array_stride = 0;
-			info.matrix_stride = 0;
-			info.type = type;
+			info.array_size = size;
+			info.type = from_gl_type(type);
 			uniforms_by_index[i] = &info;
 		}
 	}
@@ -279,8 +344,6 @@ void Program::query_uniforms()
 		query_uniform_blocks(uniforms_by_index);
 
 	UniformBlockInfo &default_block = uniform_blocks[string()];
-	default_block.data_size = 0;
-	default_block.bind_point = -1;
 
 	for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
 		if(!i->second.block)
@@ -292,16 +355,11 @@ void Program::query_uniforms()
 
 	default_block.layout_hash = compute_layout_hash(default_block.uniforms);
 
-	string layout_descriptor;
-	for(UniformBlockMap::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-		layout_descriptor += format("%d:%x\n", i->second.bind_point, i->second.layout_hash);
-	uniform_layout_hash = hash32(layout_descriptor);
+	update_layout_hash();
 }
 
 void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_index)
 {
-	uniform_blocks.clear();
-
 	std::set<unsigned> used_bind_points;
 	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
 	for(unsigned i=0; i<count; ++i)
@@ -327,37 +385,35 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 			uniforms_by_index[*j]->block = &info;
 		}
 
-		vector<unsigned> indices2(indices.begin(), indices.end());
+		vector<unsigned> query_indices(indices.begin(), indices.end());
 		vector<int> values(indices.size());
-		glGetActiveUniformsiv(id, indices.size(), &indices2[0], GL_UNIFORM_OFFSET, &values[0]);
+		glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_OFFSET, &values[0]);
 		for(unsigned j=0; j<indices.size(); ++j)
-			uniforms_by_index[indices[j]]->location = values[j];
+			uniforms_by_index[indices[j]]->offset = values[j];
 
-		indices2.clear();
+		query_indices.clear();
 		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
-			if(uniforms_by_index[*j]->size>1)
-				indices2.push_back(*j);
-		if(!indices2.empty())
+			if(uniforms_by_index[*j]->array_size>1)
+				query_indices.push_back(*j);
+		if(!query_indices.empty())
 		{
-			glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
-			for(unsigned j=0; j<indices2.size(); ++j)
-				uniforms_by_index[indices2[j]]->array_stride = values[j];
+			glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
+			for(unsigned j=0; j<query_indices.size(); ++j)
+				uniforms_by_index[query_indices[j]]->array_stride = values[j];
 		}
 
-		indices2.clear();
+		query_indices.clear();
 		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
 		{
-			GLenum t = uniforms_by_index[*j]->type;
-			if(t==GL_FLOAT_MAT4 || t==GL_FLOAT_MAT3 || t==GL_FLOAT_MAT2 ||
-				t==GL_FLOAT_MAT2x3 || t==GL_FLOAT_MAT2x4 || t==GL_FLOAT_MAT3x2 ||
-				t==GL_FLOAT_MAT3x4 || t==GL_FLOAT_MAT4x2 || t==GL_FLOAT_MAT4x3)
-				indices2.push_back(*j);
+			DataType t = uniforms_by_index[*j]->type;
+			if(is_matrix(t))
+				query_indices.push_back(*j);
 		}
-		if(!indices2.empty())
+		if(!query_indices.empty())
 		{
-			glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
-			for(unsigned j=0; j<indices2.size(); ++j)
-				uniforms_by_index[indices2[j]]->matrix_stride = values[j];
+			glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
+			for(unsigned j=0; j<query_indices.size(); ++j)
+				uniforms_by_index[query_indices[j]]->matrix_stride = values[j];
 		}
 
 		sort(info.uniforms.begin(), info.uniforms.end(), uniform_location_compare);
@@ -389,17 +445,116 @@ void Program::query_attributes()
 			AttributeInfo &info = attributes[name];
 			info.name = name;
 			info.location = glGetAttribLocation(id, name);
-			info.size = size;
-			info.type = type;
+			info.array_size = size;
+			info.type = from_gl_type(type);
 		}
 	}
 }
 
+void Program::collect_uniforms()
+{
+	const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
+
+	UniformBlockInfo &default_block = uniform_blocks[string()];
+
+	const vector<SpirVModule::Variable> &variables = mod.get_variables();
+	for(vector<SpirVModule::Variable>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
+	{
+		if(i->storage==SpirVModule::UNIFORM && i->struct_type)
+		{
+			UniformBlockInfo &info = uniform_blocks[i->struct_type->name];
+			info.name = i->struct_type->name;
+			info.bind_point = i->binding;
+			info.data_size = i->struct_type->size;
+
+			string prefix;
+			if(!i->name.empty())
+				prefix = i->struct_type->name+".";
+			collect_block_uniforms(info, *i->struct_type, prefix, 0);
+
+			info.layout_hash = compute_layout_hash(info.uniforms);
+		}
+		else if(i->storage==SpirVModule::UNIFORM_CONSTANT && i->location>=0)
+		{
+			UniformInfo &info = uniforms[i->name];
+			info.name = i->name;
+			info.block = &default_block;
+			info.location = i->location;
+			info.array_size = i->array_size;
+			info.type = i->type;
+			default_block.uniforms.push_back(&info);
+		}
+	}
+
+	default_block.layout_hash = compute_layout_hash(default_block.uniforms);
+
+	update_layout_hash();
+}
+
+void Program::collect_block_uniforms(UniformBlockInfo &block, const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset)
+{
+	for(vector<SpirVModule::StructMember>::const_iterator i=strct.members.begin(); i!=strct.members.end(); ++i)
+	{
+		unsigned offset = base_offset+i->offset;
+		if(i->struct_type)
+		{
+			if(i->array_size)
+			{
+				for(unsigned j=0; j<i->array_size; ++j, offset+=i->array_stride)
+					collect_block_uniforms(block, *i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset);
+			}
+			else
+				collect_block_uniforms(block, *i->struct_type, prefix+i->name+".", offset);
+		}
+		else
+		{
+			string name = prefix+i->name;
+			UniformInfo &info = uniforms[name];
+			info.name = name;
+			info.block = &block;
+			info.offset = offset;
+			info.array_size = i->array_size;
+			info.array_stride = i->array_stride;
+			info.matrix_stride = i->matrix_stride;
+			info.type = i->type;
+			block.uniforms.push_back(&info);
+		}
+	}
+}
+
+void Program::collect_attributes()
+{
+	const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
+
+	const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
+	for(vector<SpirVModule::EntryPoint>::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i)
+		if(i->stage==SpirVModule::VERTEX && i->name=="main")
+		{
+			for(vector<const SpirVModule::Variable *>::const_iterator j=i->globals.begin(); j!=i->globals.end(); ++j)
+				if((*j)->storage==SpirVModule::INPUT)
+				{
+					AttributeInfo &info = attributes[(*j)->name];
+					info.name = (*j)->name;
+					info.location = (*j)->location;
+					info.array_size = (*j)->array_size;
+					info.type = (*j)->type;
+				}
+		}
+}
+
+void Program::update_layout_hash()
+{
+	string layout_descriptor;
+	for(UniformBlockMap::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
+		layout_descriptor += format("%d:%x\n", i->second.bind_point, i->second.layout_hash);
+	uniform_layout_hash = hash32(layout_descriptor);
+}
+
 Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo *> &uniforms)
 {
 	string layout_descriptor;
 	for(vector<const UniformInfo *>::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i)
-		layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->size);
+		layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->array_size);
 	return hash32(layout_descriptor);
 }
 
@@ -427,12 +582,12 @@ const Program::UniformInfo &Program::get_uniform_info(const string &name) const
 	return get_item(uniforms, name);
 }
 
-int Program::get_uniform_location(const string &n) const
+int Program::get_uniform_location(const string &name) const
 {
-	if(n[n.size()-1]==']')
+	if(name[name.size()-1]==']')
 		throw invalid_argument("Program::get_uniform_location");
 
-	UniformMap::const_iterator i = uniforms.find(n);
+	UniformMap::const_iterator i = uniforms.find(name);
 	if(i==uniforms.end())
 		return -1;
 
@@ -444,12 +599,12 @@ const Program::AttributeInfo &Program::get_attribute_info(const string &name) co
 	return get_item(attributes, name);
 }
 
-int Program::get_attribute_location(const string &n) const
+int Program::get_attribute_location(const string &name) const
 {
-	if(n[n.size()-1]==']')
+	if(name[name.size()-1]==']')
 		throw invalid_argument("Program::get_attribute_location");
 
-	AttributeMap::const_iterator i = attributes.find(n);
+	AttributeMap::const_iterator i = attributes.find(name);
 	return i!=attributes.end() ? i->second.location : -1;
 }
 
@@ -473,6 +628,30 @@ void Program::unbind()
 }
 
 
+Program::UniformInfo::UniformInfo():
+	block(0),
+	location(-1),
+	array_size(0),
+	array_stride(0),
+	matrix_stride(0),
+	type(VOID)
+{ }
+
+
+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)
 {