X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fprogram.cpp;h=00bca8343cb4d89e05f619f78bda72773a76ce77;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=37d72e94191b441a1b8be1fcbbd5317db58e794f;hpb=d971f8d4848c0b3b453c626a2dafe19445e3e5a8;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index 37d72e94..00bca834 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -28,15 +28,6 @@ Program::Program()
 	init();
 }
 
-Program::Program(const ProgramBuilder::StandardFeatures &features)
-{
-	init();
-
-	ProgramBuilder builder(features);
-	builder.add_shaders(*this);
-	link();
-}
-
 Program::Program(const std::string &source)
 {
 	init();
@@ -330,10 +321,9 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
 string Program::get_info_log() const
 {
 	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);
-	delete[] buf;
+	string log(len+1, 0);
+	glGetProgramInfoLog(id, len+1, &len, &log[0]);
+	log.erase(len);
 	return log;
 }
 
@@ -399,7 +389,6 @@ Program::Loader::Loader(Program &p):
 	add("attribute",       &Loader::attribute);
 	add("fragment_shader", &Loader::fragment_shader);
 	add("geometry_shader", &Loader::geometry_shader);
-	add("standard",        &Loader::standard);
 	add("vertex_shader",   &Loader::vertex_shader);
 }
 
@@ -423,14 +412,6 @@ void Program::Loader::geometry_shader(const string &src)
 	obj.attach_shader_owned(new GeometryShader(src));
 }
 
-void Program::Loader::standard()
-{
-	ProgramBuilder::StandardFeatures feat;
-	load_sub(feat);
-	ProgramBuilder builder(feat);
-	builder.add_shaders(obj);
-}
-
 void Program::Loader::vertex_shader(const string &src)
 {
 	obj.attach_shader_owned(new VertexShader(src));