X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=af9eac0426e4c265a76bd2dc54879a5f85b636c3;hb=f19366d32cc29287a2730cfba90893e407754081;hp=ee48b9107cddab64af53442fccb00f10bb4df1ea;hpb=fe9836f2d8d7abb0480582c544611a5b248310cc;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index ee48b910..af9eac04 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -3,6 +3,7 @@
 
 #include <set>
 #include <vector>
+#include "commands.h"
 #include "matrix.h"
 #include "pipelinestate.h"
 #include "programdata.h"
@@ -14,16 +15,17 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
+union ClearValue;
 class Clipping;
 class Material;
 class Mesh;
 class Lighting;
 class Program;
+class QueryPool;
 class Renderable;
 class Sampler;
 class Texture;
 class VertexSetup;
-class WindingTest;
 
 /**
 A class for supervising the rendering process.  While many Renderables (in
@@ -87,14 +89,19 @@ 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;
 		const VertexSetup *vertex_setup;
 		FaceWinding front_face;
 		CullMode face_cull;
+		const DepthTest *depth_test;
+		const StencilTest *stencil_test;
+		const Blend *blend;
 		unsigned object_lod_bias;
 
 		State();
@@ -114,6 +121,7 @@ private:
 	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
 	PipelineState pipeline_state;
+	Commands commands;
 
 public:
 	Renderer();
@@ -133,6 +141,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();
@@ -160,6 +174,10 @@ public:
 	void set_front_face(FaceWinding);
 	void set_face_cull(CullMode);
 
+	void set_depth_test(const DepthTest *);
+	void set_stencil_test(const StencilTest *);
+	void set_blend(const Blend *);
+
 	void set_object_lod_bias(unsigned);
 	unsigned get_object_lod_bias() const { return state->object_lod_bias; }
 
@@ -178,10 +196,17 @@ 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 &);
+
+	void begin_query(const QueryPool &, unsigned);
+	void end_query(const QueryPool &, unsigned);
+
 private:
 	void apply_state();
 };