X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=b384defe90fa0d7904133a37bd3f66429c1f88fa;hb=8366f8951984aa436938b1bb18a57067ff2260c1;hp=3af4e582f1ba85d7faae39e6331b8b699653542e;hpb=2576b6182929e26af1db22811665cf88f8f20e8e;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index 3af4e582..b384defe 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,23 +4,22 @@
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
-#include "datatype.h"
 #include "gl.h"
 #include "module.h"
+#include "reflectdata.h"
 #include "vertexformat.h"
 
 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: public Bindable<Program>
+class Program
 {
+	friend class PipelineState;
+
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Program>
 	{
@@ -28,13 +27,7 @@ public:
 		Loader(Program &, Collection &);
 
 	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:
@@ -55,68 +48,43 @@ private:
 		void specialize_int(const std::string &, int);
 	};
 
-public:
-	typedef unsigned LayoutHash;
-	struct UniformBlockInfo;
-
-	struct UniformInfo
+	enum Stage
 	{
-		std::string name;
-		const UniformBlockInfo *block;
-		union
-		{
-			int location;
-			unsigned offset;
-		};
-		unsigned array_size;
-		unsigned array_stride;
-		unsigned matrix_stride;
-		DataType type;
-
-		UniformInfo();
+		VERTEX,
+		GEOMETRY,
+		FRAGMENT,
+		MAX_STAGES
 	};
 
-	struct UniformBlockInfo
+	struct TransientData
 	{
-		std::string name;
-		unsigned data_size;
-		int bind_point;
-		std::vector<const UniformInfo *> uniforms;
-		LayoutHash layout_hash;
-
-		UniformBlockInfo();
+		std::map<std::string, unsigned> textures;
+		std::map<std::string, unsigned> blocks;
+		std::map<unsigned, int> spec_values;
 	};
 
-	struct AttributeInfo
+	struct UniformCall
 	{
-		std::string name;
+		using FuncPtr = void (*)(unsigned, unsigned, const void *);
+
 		unsigned location;
-		unsigned array_size;
-		DataType type;
+		unsigned size;
+		FuncPtr func;
 
-		AttributeInfo();
+		UniformCall(unsigned l, unsigned s, FuncPtr f): location(l), size(s), func(f) { }
 	};
 
-private:
 	unsigned id;
-	std::vector<unsigned> stage_ids;
-	const Module *module;
+	unsigned stage_ids[MAX_STAGES];
 	bool linked;
-	std::vector<UniformBlockInfo> uniform_blocks;
-	std::vector<UniformInfo> uniforms;
-	LayoutHash uniform_layout_hash;
-	std::vector<AttributeInfo> attributes;
+	ReflectData reflect_data;
+	std::vector<UniformCall> uniform_calls;
+	std::string debug_name;
 
 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>());
 
@@ -127,51 +95,37 @@ public:
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-	unsigned add_stage(GLenum);
-	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> &);
-
-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;
+	bool has_stages() const;
+	unsigned add_stage(Stage);
+	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+	void compile_glsl_stage(const GlslModule &, unsigned);
+	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &, TransientData &);
 
-	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 finalize(const Module &, const TransientData &);
 	void query_uniforms();
-	void query_uniform_blocks(const std::vector<UniformInfo *> &);
+	void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
 	void query_attributes();
-	void collect_uniforms();
-	void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
-	void collect_attributes();
-	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_name_compare(const UniformInfo &, const UniformInfo &);
-	template<typename T>
-	static bool name_search(const T &, const std::string &);
+	void collect_uniforms(const SpirVModule &, const std::map<unsigned, int> &);
+	void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, const std::map<unsigned, int> &, std::vector<std::string> &);
+	void collect_attributes(const SpirVModule &);
+
 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; }
-	const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
-	const std::vector<UniformInfo> &get_uniforms() const { return uniforms; }
-	const UniformInfo &get_uniform_info(const std::string &) const;
+	ReflectData::LayoutHash get_uniform_layout_hash() const { return reflect_data.layout_hash; }
+	const std::vector<ReflectData::UniformBlockInfo> &get_uniform_blocks() const { return reflect_data.uniform_blocks; }
+	const ReflectData::UniformBlockInfo &get_uniform_block_info(const std::string &) const;
+	const std::vector<ReflectData::UniformInfo> &get_uniforms() const { return reflect_data.uniforms; }
+	const ReflectData::UniformInfo &get_uniform_info(const std::string &) const;
+	const ReflectData::UniformInfo &get_uniform_info(Tag) const;
 	int get_uniform_location(const std::string &) const;
-	const std::vector<AttributeInfo> &get_attributes() const { return attributes; }
-	const AttributeInfo &get_attribute_info(const std::string &) const;
+	int get_uniform_location(Tag) const;
+	int get_uniform_binding(Tag) const;
+	const std::vector<ReflectData::AttributeInfo> &get_attributes() const { return reflect_data.attributes; }
+	const ReflectData::AttributeInfo &get_attribute_info(const std::string &) const;
 	int get_attribute_location(const std::string &) const;
 
-	void bind() const;
-	static void unbind();
+	void set_debug_name(const std::string &);
+private:
+	void set_stage_debug_name(unsigned, Stage);
 };
 
 } // namespace GL