X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=a4358acb4d6d74e048c1c416107540f4fb9bdce9;hb=5ae4b0008b25072b5716f0cb585133315625a661;hp=636988d75c75dd11f3728906cf3c761b31553b34;hpb=9034e81679eeeaa3d1d5d643d3f924d9edb45a68;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index 636988d7..a4358acb 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -1,13 +1,16 @@
 #include <algorithm>
 #include <cstring>
+#include <set>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/strings/format.h>
-#include "arb_shader_objects.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_shader.h"
 #include "buffer.h"
 #include "error.h"
+#include "misc.h"
 #include "program.h"
 #include "shader.h"
 
@@ -27,8 +30,7 @@ Program::Program(const ProgramBuilder::StandardFeatures &features)
 
 	ProgramBuilder builder(features);
 	builder.add_shaders(*this);
-	if(!features.transform)
-		link();
+	link();
 }
 
 Program::Program(const string &vert, const string &frag)
@@ -87,6 +89,17 @@ void Program::bind_attribute(unsigned index, const string &name)
 	glBindAttribLocation(id, index, name.c_str());
 }
 
+void Program::bind_attribute(VertexComponent comp, const string &name)
+{
+	bind_attribute(get_component_type(comp), name);
+}
+
+void Program::bind_fragment_data(unsigned index, const string &name)
+{
+	static Require _req(EXT_gpu_shader4);
+	glBindFragDataLocation(id, index, name.c_str());
+}
+
 void Program::link()
 {
 	for(ShaderList::iterator i=shaders.begin(); i!=shaders.end(); ++i)
@@ -94,15 +107,14 @@ void Program::link()
 			(*i)->compile();
 
 	uniforms.clear();
+	legacy_vars = false;
 
 	glLinkProgram(id);
-	int value;
-	glGetProgramiv(id, GL_LINK_STATUS, &value);
-	if(!(linked = value))
+	linked = get_program_i(id, GL_LINK_STATUS);
+	if(!linked)
 		throw compile_error(get_info_log());
 
-	glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &value);
-	unsigned count = value;
+	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
 	vector<UniformInfo *> uniforms_by_index(count);
 	for(unsigned i=0; i<count; ++i)
 	{
@@ -110,9 +122,14 @@ void Program::link()
 		int len = 0;
 		int size;
 		GLenum type;
-		glGetActiveUniform(id, i, 128, &len, &size, &type, name);
+		glGetActiveUniform(id, i, sizeof(name), &len, &size, &type, name);
 		if(len && strncmp(name, "gl_", 3))
 		{
+			/* Some implementations report the first element of a uniform array,
+			others report just the name of the array itself. */
+			if(len>3 && !strcmp(name+len-3, "[0]"))
+				name[len-3] = 0;
+
 			UniformInfo &info = uniforms[name];
 			info.block = 0;
 			info.name = name;
@@ -122,20 +139,37 @@ void Program::link()
 			info.type = type;
 			uniforms_by_index[i] = &info;
 		}
+		else
+			legacy_vars = true;
+	}
+
+	count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
+	for(unsigned i=0; i<count; ++i)
+	{
+		char name[128];
+		int len = 0;
+		int size;
+		GLenum type;
+		glGetActiveAttrib(id, i, sizeof(name), &len, &size, &type, name);
+		if(len && !strncmp(name, "gl_", 3))
+			legacy_vars = true;
 	}
 
 	if(ARB_uniform_buffer_object)
 	{
-		glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &value);
-		count = value;
+		uniform_blocks.clear();
+
+		std::set<unsigned> used_bind_points;
+		count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
 		for(unsigned i=0; i<count; ++i)
 		{
 			char name[128];
 			int len;
-			glGetActiveUniformBlockName(id, i, 128, &len, name);
+			glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
 			UniformBlockInfo &info = uniform_blocks[name];
 			info.name = name;
 
+			int value;
 			glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
 			info.data_size = value;
 
@@ -164,7 +198,7 @@ void Program::link()
 			{
 				glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
 				for(unsigned j=0; j<indices2.size(); ++j)
-					uniforms_by_index[indices[j]]->array_stride = values[j];
+					uniforms_by_index[indices2[j]]->array_stride = values[j];
 			}
 
 			indices2.clear();
@@ -180,28 +214,41 @@ void Program::link()
 			{
 				glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
 				for(unsigned j=0; j<indices2.size(); ++j)
-					uniforms_by_index[indices[j]]->matrix_stride = values[j];
+					uniforms_by_index[indices2[j]]->matrix_stride = values[j];
 			}
 
 			sort(info.uniforms.begin(), info.uniforms.end(), uniform_location_compare);
 			info.layout_hash = compute_layout_hash(info.uniforms);
-			info.bind_point = info.layout_hash%BufferRange::get_n_uniform_buffer_bindings();
+			unsigned n_bindings = BufferRange::get_n_uniform_buffer_bindings();
+			info.bind_point = info.layout_hash%n_bindings;
+			while(used_bind_points.count(info.bind_point))
+				info.bind_point = (info.bind_point+1)%n_bindings;
 			glUniformBlockBinding(id, i, info.bind_point);
+			used_bind_points.insert(info.bind_point);
 		}
 	}
 
-	vector<const UniformInfo *> blockless_uniforms;
+	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)
 		{
 			i->second.location = glGetUniformLocation(id, i->second.name.c_str());
-			blockless_uniforms.push_back(&i->second);
+			i->second.block = &default_block;
+			default_block.uniforms.push_back(&i->second);
 		}
 
-	uniform_layout_hash = compute_layout_hash(blockless_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);
 }
 
-unsigned Program::compute_layout_hash(const vector<const UniformInfo *> &uniforms)
+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)
@@ -216,8 +263,7 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
 
 string Program::get_info_log() const
 {
-	GLsizei len = 0;
-	glGetProgramiv(id, GL_INFO_LOG_LENGTH, &len);
+	GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH);
 	char *buf = new char[len+1];
 	glGetProgramInfoLog(id, len+1, &len, buf);
 	string log(buf, len);
@@ -249,15 +295,15 @@ int Program::get_uniform_location(const string &n) const
 				gives us the first element of the array, so try to look that up and
 				add an offset. */
 				unsigned offset = lexical_cast<unsigned>(n.substr(open_bracket+1, n.size()-2-open_bracket));
-				i = uniforms.find(n.substr(0, open_bracket)+"[0]");
-				if(i!=uniforms.end() && !i->second.block && offset<i->second.size)
+				i = uniforms.find(n.substr(0, open_bracket));
+				if(i!=uniforms.end() && i->second.block->bind_point<0 && offset<i->second.size)
 					return i->second.location+offset;
 			}
 		}
 		return -1;
 	}
 
-	return i->second.block ? -1 : i->second.location;
+	return i->second.block->bind_point<0 ? i->second.location : -1;
 }
 
 void Program::bind() const