X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=ca5437f3a6970e6d626bf36520ebc828d0697ab1;hp=41c5897dc08ccb54a5461a798c78b425b5315bf9;hb=HEAD;hpb=acaefb4c669f01855252818ef0a2958cbdababc3

diff --git a/source/core/program.h b/source/core/program.h
index 41c5897d..3e206a70 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -6,18 +6,21 @@
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "module.h"
+#include "program_backend.h"
 #include "reflectdata.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-A complete shader program.  Programs can be assembled of individual Shaders or
-generated with a set of standard features.
+A shader program consisting of one or more stages.
+
+Programs are created from Modules.  Specialization values can be applied to
+customize behaviour of the module.
 */
-class Program
+class Program: public ProgramBackend
 {
-	friend class PipelineState;
+	friend ProgramBackend;
 
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Program>
@@ -47,69 +50,34 @@ private:
 		void specialize_int(const std::string &, int);
 	};
 
-	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;
-	};
-
-	struct UniformCall
-	{
-		using FuncPtr = void (*)(unsigned, unsigned, const void *);
-
-		unsigned location;
-		unsigned size;
-		FuncPtr func;
-
-		UniformCall(unsigned l, unsigned s, FuncPtr f): location(l), size(s), func(f) { }
-	};
-
-	unsigned id;
-	unsigned stage_ids[MAX_STAGES];
-	bool linked;
 	ReflectData reflect_data;
-	std::vector<UniformCall> uniform_calls;
-	std::string debug_name;
+	SpirVModule *specialized_spirv = 0;
 
 public:
 	/// Constructs an empty Program with no shader stages attached.
-	Program();
+	Program() = default;
 
 	/// Constructs a Program from a Module, with specialization constants.
 	Program(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 
-private:
-	void init();
-public:
-	virtual ~Program();
+	Program(Program &&);
+	~Program();
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-	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 &);
-
-	void finalize(const Module &, const TransientData &);
-	void query_uniforms();
-	void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
-	void query_attributes();
-	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_uniforms(const SpirVModule &);
+	void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
 	void collect_attributes(const SpirVModule &);
+	void collect_builtins(const SpirVModule &);
+	void collect_builtins(const SpirVModule::Structure &);
 
 public:
+	using ProgramBackend::is_compute;
+	using ProgramBackend::has_tessellation;
+
 	ReflectData::LayoutHash get_uniform_layout_hash() const { return reflect_data.layout_hash; }
+	unsigned get_n_descriptor_sets() const { return reflect_data.n_descriptor_sets; }
+	unsigned get_push_constants_size() const { return reflect_data.push_constants_size; }
 	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; }
@@ -118,13 +86,18 @@ public:
 	int get_uniform_location(const std::string &) const;
 	int get_uniform_location(Tag) const;
 	int get_uniform_binding(Tag) const;
+	bool uses_uniform_block_binding(int b) const { return uses_binding(b|ReflectData::UNIFORM_BLOCK_BINDING); }
+	bool uses_texture_binding(unsigned b) const { return uses_binding(b|ReflectData::TEXTURE_BINDING); }
+private:
+	bool uses_binding(int) const;
+public:
 	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;
+	unsigned get_n_clip_distances() const { return reflect_data.n_clip_distances; }
+	const LinAl::Vector<unsigned, 3> &get_compute_workgroup_size() const { return reflect_data.compute_wg_size; }
 
-	void set_debug_name(const std::string &);
-private:
-	void set_stage_debug_name(unsigned, Stage);
+	using ProgramBackend::set_debug_name;
 };
 
 } // namespace GL