X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=b7f46ee4082a74a17ff68aa24328b6c5c01cf9f5;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=a494e0798f5d67ef5ecaf7f770d7e289a06bc150;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index a494e079..b7f46ee4 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,24 +4,22 @@
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
-#include "datatype.h"
 #include "gl.h"
 #include "module.h"
-#include "tag.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
 {
+	friend class PipelineState;
+
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Program>
 	{
@@ -31,11 +29,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:
@@ -56,51 +50,6 @@ private:
 		void specialize_int(const std::string &, int);
 	};
 
-public:
-	typedef unsigned LayoutHash;
-	struct UniformBlockInfo;
-
-	struct UniformInfo
-	{
-		std::string name;
-		const UniformBlockInfo *block;
-		union
-		{
-			int location;
-			unsigned offset;
-		};
-		unsigned array_size;
-		unsigned array_stride;
-		unsigned matrix_stride;
-		DataType type;
-		Tag tag;
-		int binding;
-
-		UniformInfo();
-	};
-
-	struct UniformBlockInfo
-	{
-		std::string name;
-		unsigned data_size;
-		int bind_point;
-		std::vector<const UniformInfo *> uniforms;
-		LayoutHash layout_hash;
-
-		UniformBlockInfo();
-	};
-
-	struct AttributeInfo
-	{
-		std::string name;
-		unsigned location;
-		unsigned array_size;
-		DataType type;
-
-		AttributeInfo();
-	};
-
-private:
 	enum Stage
 	{
 		VERTEX,
@@ -121,22 +70,13 @@ private:
 	const Module *module;
 	TransientData *transient;
 	bool linked;
-	std::vector<UniformBlockInfo> uniform_blocks;
-	std::vector<UniformInfo> uniforms;
-	LayoutHash uniform_layout_hash;
-	std::vector<AttributeInfo> attributes;
+	ReflectData reflect_data;
 	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>());
 
@@ -154,45 +94,31 @@ 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();
-	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 *);
+
 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;
-	const UniformInfo &get_uniform_info(Tag) 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;
 	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;
+	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_id() const { return id; }
-
 	void set_debug_name(const std::string &);
 private:
 	void set_stage_debug_name(unsigned, Stage);