X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=1ca146f1e998c0fd0d05221a4dab0b66a6da31e6;hb=2e09b4f72f06537431151fe8b2574e1aa886ad48;hp=f2d7d07672643edb8c83dd4a214bd45a7594be4b;hpb=715672cf2c64dab0744db676fdee255ee3a4cef7;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index f2d7d076..1ca146f1 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -13,14 +13,14 @@
 namespace Msp {
 namespace GL {
 
-class Shader;
-
 /**
 A complete shader program.  Programs can be assembled of individual Shaders or
 generated with a set of standard features.
 */
 class Program
 {
+	friend class PipelineState;
+
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Program>
 	{
@@ -30,11 +30,7 @@ public:
 	private:
 		virtual void finish();
 
-		void attribute(unsigned, const std::string &);
-		void fragment_shader(const std::string &);
-		void geometry_shader(const std::string &);
 		void module(const std::string &);
-		void vertex_shader(const std::string &);
 	};
 
 private:
@@ -130,12 +126,6 @@ public:
 	/// Constructs an empty Program with no shader stages attached.
 	Program();
 
-	/// Constructs a Program from unified source code using ProgramCompiler.
-	DEPRECATED Program(const std::string &);
-
-	/// Constructs a Program from vertex and fragment shader source code.
-	DEPRECATED Program(const std::string &, const std::string &);
-
 	/// Constructs a Program from a Module, with specialization constants.
 	Program(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 
@@ -153,15 +143,6 @@ private:
 	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 
 public:
-	DEPRECATED void attach_shader(Shader &shader);
-	DEPRECATED void attach_shader_owned(Shader *shader);
-	DEPRECATED void detach_shader(Shader &shader);
-	DEPRECATED const std::vector<Shader *> &get_attached_shaders() const;
-
-	DEPRECATED void bind_attribute(unsigned, const std::string &);
-	DEPRECATED void bind_attribute(VertexAttribute, const std::string &);
-	DEPRECATED void bind_fragment_data(unsigned, const std::string &);
-
 	void link();
 private:
 	void query_uniforms();
@@ -175,7 +156,6 @@ private:
 	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
 public:
 	bool is_linked() const { return linked; }
-	DEPRECATED std::string get_info_log() const;
 
 	LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; }
 	const std::vector<UniformBlockInfo> &get_uniform_blocks() const { return uniform_blocks; }
@@ -190,8 +170,6 @@ public:
 	const AttributeInfo &get_attribute_info(const std::string &) const;
 	int get_attribute_location(const std::string &) const;
 
-	unsigned get_id() const { return id; }
-
 	void set_debug_name(const std::string &);
 private:
 	void set_stage_debug_name(unsigned, Stage);