X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=66ca36b1c5210a3ec0e0e29ff1b61a0336bcbe9e;hb=4d7f66ea28c788e12f700216b9c53af9e71b8390;hp=c8ce67a8897fc6fd5499b251e4a7713b71ff496e;hpb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index c8ce67a8..66ca36b1 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -5,6 +5,7 @@
 #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 "buffer.h"
 #include "error.h"
@@ -28,8 +29,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)
@@ -88,6 +88,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)
@@ -114,7 +125,7 @@ void Program::link()
 		if(len && strncmp(name, "gl_", 3))
 		{
 			/* Some implementations report the first element of a uniform array,
-			others report just the name of an array. */
+			others report just the name of the array itself. */
 			if(len>3 && !strcmp(name+len-3, "[0]"))
 				name[len-3] = 0;