X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=faaf2ac4c081c8fcadc84e366244eda74fe1a55c;hb=9be04243c92f024327e74ad8d48861581d83b7ed;hp=d2032a5cd46843e36def08c91f8a95d699025bd1;hpb=a170be7d2b295c4a3bbcea6585634bece3e1638b;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index d2032a5c..faaf2ac4 100644
--- a/source/program.h
+++ b/source/program.h
@@ -81,14 +81,16 @@ private:
 	UniformMap uniforms;
 	LayoutHash uniform_layout_hash;
 	AttributeMap attributes;
-	bool legacy_vars;
 
 public:
 	/// Constructs an empty Program with no Shaders attached.
 	Program();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 	/// Constructs a Program with standard features.
-	Program(const ProgramBuilder::StandardFeatures &);
+	DEPRECATED Program(const ProgramBuilder::StandardFeatures &);
+#pragma GCC diagnostic pop
 
 	/// Constructs a Program from unified source code using ProgramCompiler.
 	Program(const std::string &);
@@ -112,6 +114,7 @@ public:
 
 	void link();
 private:
+	static void require_type(GLenum);
 	void query_uniforms();
 	void query_uniform_blocks(const std::vector<UniformInfo *> &);
 	void query_attributes();
@@ -131,8 +134,6 @@ public:
 	const AttributeInfo &get_attribute_info(const std::string &) const;
 	int get_attribute_location(const std::string &) const;
 
-	bool uses_legacy_variables() const { return legacy_vars; }
-
 	void bind() const;
 	static void unbind();
 };