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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index ffaa917d..79bd5cd9 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;
 
@@ -64,6 +69,7 @@ private:
 		mutable int binding = -1;
 		const Texture *texture = 0;
 		const Sampler *sampler = 0;
+		int level = -1;
 		int replaced = -1;
 	};
 
@@ -77,6 +83,7 @@ private:
 
 	struct State
 	{
+		std::uintptr_t pipeline_key = 0;
 		const Camera *camera = 0;
 		Matrix model_matrix;
 		const Framebuffer *framebuffer = 0;
@@ -96,6 +103,7 @@ private:
 
 	enum ChangeMask
 	{
+		PIPELINE_KEY = 1,
 		MATRIX = 2,
 		SHADER_DATA = 16
 	};
@@ -107,6 +115,8 @@ private:
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
 	std::vector<BoundTexture> texture_stack;
+	const Texture &placeholder_texture;
+	PipelineState *last_pipeline = 0;
 	Commands commands;
 
 public:
@@ -133,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 &);
 
@@ -160,6 +172,7 @@ 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);
 
 private:
 	void flush_shader_data();
@@ -177,7 +190,10 @@ public:
 	void set_object_lod_bias(unsigned);
 	unsigned get_object_lod_bias() const { return get_state().object_lod_bias; }
 
-	void clear(const ClearValue *);
+	/** Clears framebuffer contents.  If values is not null, it must contain one
+	element for each attachment.  Otherwise the framebuffer contents are
+	discarded and become undefined. */
+	void clear(const ClearValue *values);
 
 	/** Draws a batch of primitives.  A shader must be active. */
 	void draw(const Batch &);
@@ -193,6 +209,8 @@ public:
 	void end_query(const QueryPool &, unsigned);
 
 private:
+	PipelineState &get_pipeline_state();
+	void apply_framebuffer();
 	void apply_state();
 };