X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=f2d7d07672643edb8c83dd4a214bd45a7594be4b;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=939521dcd804866a65f52d544b6aa722e773c798;hpb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index 939521dc..f2d7d076 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
@@ -20,7 +19,7 @@ class Shader;
 A complete shader program.  Programs can be assembled of individual Shaders or
 generated with a set of standard features.
 */
-class Program: public Bindable<Program>
+class Program
 {
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Program>
@@ -74,6 +73,7 @@ public:
 		unsigned matrix_stride;
 		DataType type;
 		Tag tag;
+		int binding;
 
 		UniformInfo();
 	};
@@ -100,21 +100,31 @@ public:
 	};
 
 private:
-	struct Bindings
+	enum Stage
+	{
+		VERTEX,
+		GEOMETRY,
+		FRAGMENT,
+		MAX_STAGES
+	};
+
+	struct TransientData
 	{
 		std::map<std::string, unsigned> textures;
 		std::map<std::string, unsigned> blocks;
+		std::map<unsigned, int> spec_values;
 	};
 
 	unsigned id;
-	std::vector<unsigned> stage_ids;
+	unsigned stage_ids[MAX_STAGES];
 	const Module *module;
-	Bindings *bindings;
+	TransientData *transient;
 	bool linked;
 	std::vector<UniformBlockInfo> uniform_blocks;
 	std::vector<UniformInfo> uniforms;
 	LayoutHash uniform_layout_hash;
 	std::vector<AttributeInfo> attributes;
+	std::string debug_name;
 
 public:
 	/// Constructs an empty Program with no shader stages attached.
@@ -136,7 +146,8 @@ public:
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-	unsigned add_stage(GLenum);
+	bool has_stages() const;
+	unsigned add_stage(Stage);
 	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
 	void compile_glsl_stage(unsigned);
 	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
@@ -162,9 +173,6 @@ private:
 	void update_layout_hash();
 	static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
 	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
-	static bool uniform_tag_compare(const UniformInfo &, const UniformInfo &);
-	template<typename T, typename A, A T::*>
-	static bool search(const T &, const A &);
 public:
 	bool is_linked() const { return linked; }
 	DEPRECATED std::string get_info_log() const;
@@ -177,12 +185,16 @@ public:
 	const UniformInfo &get_uniform_info(Tag) const;
 	int get_uniform_location(const std::string &) const;
 	int get_uniform_location(Tag) const;
+	int get_uniform_binding(Tag) const;
 	const std::vector<AttributeInfo> &get_attributes() const { return attributes; }
 	const AttributeInfo &get_attribute_info(const std::string &) const;
 	int get_attribute_location(const std::string &) const;
 
-	void bind() const;
-	static void unbind();
+	unsigned get_id() const { return id; }
+
+	void set_debug_name(const std::string &);
+private:
+	void set_stage_debug_name(unsigned, Stage);
 };
 
 } // namespace GL