X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=79bd5cd913931a7eeca01f0e79e358b6965fd329;hp=51989f7711f8b84bd8a43a1eb8d872cb2a3cf7d2;hb=ab9b22356f16aea822527c06186641d3121e1355;hpb=b7808c60e0bbbb198500066880b6ed37c0b0e9d0

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 51989f77..79bd5cd9 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -83,6 +83,7 @@ private:
 
 	struct State
 	{
+		std::uintptr_t pipeline_key = 0;
 		const Camera *camera = 0;
 		Matrix model_matrix;
 		const Framebuffer *framebuffer = 0;
@@ -102,6 +103,7 @@ private:
 
 	enum ChangeMask
 	{
+		PIPELINE_KEY = 1,
 		MATRIX = 2,
 		SHADER_DATA = 16
 	};
@@ -114,6 +116,7 @@ private:
 	std::vector<BoundProgramData> shdata_stack;
 	std::vector<BoundTexture> texture_stack;
 	const Texture &placeholder_texture;
+	PipelineState *last_pipeline = 0;
 	Commands commands;
 
 public:
@@ -140,6 +143,8 @@ private:
 	State &get_state() const;
 
 public:
+	void set_pipeline_key(std::uintptr_t);
+
 	/** Sets the camera to render from.  The model matrix is reset to identity. */
 	void set_camera(const Camera &);
 
@@ -204,6 +209,7 @@ public:
 	void end_query(const QueryPool &, unsigned);
 
 private:
+	PipelineState &get_pipeline_state();
 	void apply_framebuffer();
 	void apply_state();
 };