X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=39ac462fbb96d4901c8f9ec884ba141dce04ecb6;hb=94cadd1618f93239b1cb0acbd4f958257c035c98;hp=1cbcdc60546b93f0cccc2db6ee5cb95a27107b39;hpb=0bcebf9930e4baada774a16c0e7637a22a410bb4;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 1cbcdc60..39ac462f 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "commands.h"
+#include "cullface.h"
 #include "matrix.h"
 #include "programdata.h"
 #include "renderer_backend.h"
@@ -13,16 +14,20 @@ namespace Msp {
 namespace GL {
 
 class Batch;
+class Blend;
 class Buffer;
 class Camera;
 union ClearValue;
+class DepthTest;
 class Material;
 class Mesh;
 class Lighting;
 class Program;
 class QueryPool;
+struct Rect;
 class Renderable;
 class Sampler;
+class StencilTest;
 class Texture;
 class VertexSetup;
 
@@ -58,13 +63,25 @@ public:
 	};
 
 private:
-	struct BoundTexture
+	struct SampledTexture
 	{
-		Tag tag;
-		mutable int binding = -1;
 		const Texture *texture = 0;
 		const Sampler *sampler = 0;
+		int level = -1;
+
+		SampledTexture() = default;
+		SampledTexture(const Texture *t, const Sampler *s, int l): texture(t), sampler(s), level(l) { }
+
+		bool operator==(const SampledTexture &o) const { return texture==o.texture && sampler==o.sampler && level==o.level; }
+	};
+
+	template<typename T>
+	struct BoundResource
+	{
+		Tag tag;
+		mutable int binding = -1;
 		int replaced = -1;
+		T resource;
 	};
 
 	struct BoundProgramData
@@ -77,6 +94,7 @@ private:
 
 	struct State
 	{
+		std::uintptr_t pipeline_key = 0;
 		const Camera *camera = 0;
 		Matrix model_matrix;
 		const Framebuffer *framebuffer = 0;
@@ -96,7 +114,9 @@ private:
 
 	enum ChangeMask
 	{
+		PIPELINE_KEY = 1,
 		MATRIX = 2,
+		CAMERA = 4,
 		SHADER_DATA = 16
 	};
 
@@ -106,9 +126,15 @@ private:
 	State *current_state = 0;
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
-	std::vector<BoundTexture> texture_stack;
+	std::vector<BoundResource<SampledTexture>> texture_stack;
+	const Texture &placeholder_texture;
+	const Sampler &default_sampler;
+	PipelineState *last_pipeline = 0;
 	Commands commands;
 
+	static const Tag world_obj_matrix_tag;
+	static const Tag world_obj_normal_matrix_tag;
+
 public:
 	Renderer();
 
@@ -133,6 +159,16 @@ private:
 	State &get_state() const;
 
 public:
+	void set_pipeline_key(std::uintptr_t);
+	void set_pipeline_key(const void *p) { set_pipeline_key(reinterpret_cast<uintptr_t>(p)); }
+
+	template<typename T>
+	void set_pipeline_key(std::uintptr_t k, T d)
+	{ set_pipeline_key(k^(static_cast<uintptr_t>(d)<<((sizeof(std::uintptr_t)-sizeof(T))*std::numeric_limits<char>::digits))); }
+
+	template<typename T>
+	void set_pipeline_key(const void *p, T d) { set_pipeline_key(reinterpret_cast<uintptr_t>(p), d); }
+
 	/** Sets the camera to render from.  The model matrix is reset to identity. */
 	void set_camera(const Camera &);
 
@@ -160,10 +196,17 @@ public:
 	void add_shader_data(const ProgramData &data);
 
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
+	void set_texture(Tag, const Texture *, int, const Sampler * = 0);
+	void set_storage_texture(Tag, const Texture *);
 
 private:
+	template<typename T>
+	static void set_resource(std::vector<BoundResource<T>> &, unsigned &, Tag, const T &);
+
 	void flush_shader_data();
-	void flush_textures();
+
+	template<typename T>
+	static void flush_resources(std::vector<BoundResource<T>> &, unsigned &);
 
 public:
 	void set_vertex_setup(const VertexSetup *);
@@ -188,14 +231,19 @@ public:
 	/** Draws multiple instances of a batch of primitives.  A shader must be active. */
 	void draw_instanced(const Batch &, unsigned);
 
+	/** Dispatches a compute operation. */
+	void dispatch(unsigned, unsigned = 1, unsigned = 1);
+
 	/** Resolves multisample attachments from the active framebuffer into
-	target. */
-	void resolve_multisample(Framebuffer &target);
+	their corresponding resolve attachments. */
+	void resolve_multisample();
 
 	void begin_query(const QueryPool &, unsigned);
 	void end_query(const QueryPool &, unsigned);
 
 private:
+	PipelineState &get_pipeline_state();
+	void apply_framebuffer();
 	void apply_state();
 };