X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=8026f5ab8770429981c399b5f2482656756717fe;hp=23ced9e4fc567bc124a80fefd70b330937f149cc;hb=006bdb4f8660098fc524dcca80b24c943c65b249;hpb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 23ced9e4..8026f5ab 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -3,6 +3,8 @@
 
 #include <set>
 #include <vector>
+#include "commands.h"
+#include "framebuffer.h"
 #include "matrix.h"
 #include "pipelinestate.h"
 #include "programdata.h"
@@ -23,7 +25,6 @@ class Renderable;
 class Sampler;
 class Texture;
 class VertexSetup;
-class WindingTest;
 
 /**
 A class for supervising the rendering process.  While many Renderables (in
@@ -87,8 +88,10 @@ private:
 	{
 		const Camera *camera;
 		Matrix model_matrix;
+		const Framebuffer *framebuffer;
+		const Rect *viewport;
+		const Rect *scissor;
 		unsigned texture_count;
-		unsigned lowest_effect_texunit;
 		const Clipping *clipping;
 		const Program *shprog;
 		unsigned shdata_count;
@@ -117,6 +120,7 @@ private:
 	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
 	PipelineState pipeline_state;
+	Commands commands;
 
 public:
 	Renderer();
@@ -136,6 +140,12 @@ public:
 	/** Returns the current model matrix. */
 	const Matrix &get_matrix() const { return state->model_matrix; }
 
+	void set_framebuffer(const Framebuffer *);
+	void set_viewport(const Rect *);
+	void set_scissor(const Rect *);
+
+	const Framebuffer *get_framebuffer() const { return state->framebuffer; }
+
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
 private:
 	void flush_textures();
@@ -185,10 +195,14 @@ public:
 	void exclude(const Renderable &);
 	void include(const Renderable &);
 
+	void clear(const ClearValue *);
+
 	void render(const Renderable &, Tag = Tag());
 	void draw(const Batch &);
 	void draw_instanced(const Batch &, unsigned);
 
+	void resolve_multisample(Framebuffer &, BufferBits);
+
 private:
 	void apply_state();
 };