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

diff --git a/source/program.cpp b/source/program.cpp
index 6313043e..00bca834 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -28,18 +28,6 @@ Program::Program()
 	init();
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-Program::Program(const ProgramBuilder::StandardFeatures &features)
-{
-	init();
-
-	ProgramBuilder builder(features);
-	builder.add_shaders(*this);
-	link();
-}
-#pragma GCC diagnostic pop
-
 Program::Program(const std::string &source)
 {
 	init();
@@ -401,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);
 }
 
@@ -425,17 +412,6 @@ void Program::Loader::geometry_shader(const string &src)
 	obj.attach_shader_owned(new GeometryShader(src));
 }
 
-void Program::Loader::standard()
-{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	ProgramBuilder::StandardFeatures feat;
-	load_sub(feat);
-	ProgramBuilder builder(feat);
-	builder.add_shaders(obj);
-#pragma GCC diagnostic pop
-}
-
 void Program::Loader::vertex_shader(const string &src)
 {
 	obj.attach_shader_owned(new VertexShader(src));