X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=66ca36b1c5210a3ec0e0e29ff1b61a0336bcbe9e;hb=a1eb8711ba225bb4423868c50369ad5592465171;hp=95102fe9b8367205ec70976f3f77b9b1811d3ea5;hpb=0778636782c7c42564bfea87d56fc76c583a888e;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index 95102fe9..66ca36b1 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -2,12 +2,14 @@
 #include <cstring>
 #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 +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)
@@ -87,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)
@@ -94,15 +106,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,11 +121,11 @@ 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 an array. */
+			others report just the name of the array itself. */
 			if(len>3 && !strcmp(name+len-3, "[0]"))
 				name[len-3] = 0;
 
@@ -127,20 +138,34 @@ 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;
+		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;
 
@@ -221,8 +246,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);