Mark ProgramBuilder as deprecated

diff --git a/source/program.cpp b/source/program.cpp
index 37d72e94191b441a1b8be1fcbbd5317db58e794f..116e16e7251544b902ac7082e32fb82f8c624666 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -32,8 +32,11 @@ Program::Program(const ProgramBuilder::StandardFeatures &features)
 {
        init();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
        ProgramBuilder builder(features);
        builder.add_shaders(*this);
+#pragma GCC diagnostic pop
        link();
 }
 
@@ -425,10 +428,13 @@ void Program::Loader::geometry_shader(const string &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)

diff --git a/source/program.h b/source/program.h
index 8c1356c2678a7ec306ddfe60368d12dd5805caac..2906fc11ffb333d5cae42532130875ab171ad232 100644 (file)
--- a/source/program.h
+++ b/source/program.h
@@ -87,7 +87,7 @@ public:
        Program();
 
        /// Constructs a Program with standard features.
-       Program(const ProgramBuilder::StandardFeatures &);
+       DEPRECATED Program(const ProgramBuilder::StandardFeatures &);
 
        /// Constructs a Program from unified source code using ProgramCompiler.
        Program(const std::string &);

diff --git a/source/programbuilder.h b/source/programbuilder.h
index 053eb567487a9a03964235a5d04b3d84c555a68c..91851d137f776cd43629e22e5ae15137f2364938 100644 (file)
--- a/source/programbuilder.h
+++ b/source/programbuilder.h
@@ -51,7 +51,7 @@ The custom variables should always include at least one override for a built-in
 variable; otherwise they will be ignored as no built-in expression references
 them.
 */
-class ProgramBuilder
+class DEPRECATED ProgramBuilder
 {
 public:
        /**