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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index ee48b910..fa7de736 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
@@ -67,37 +69,38 @@ private:
 	struct BoundTexture
 	{
 		Tag tag;
-		mutable int unit;
-		const Texture *texture;
-		const Sampler *sampler;
-		int replaced;
-
-		BoundTexture();
+		mutable int unit = -1;
+		const Texture *texture = 0;
+		const Sampler *sampler = 0;
+		int replaced = -1;
 	};
 
 	struct BoundProgramData
 	{
 		const ProgramData *shdata;
-		mutable unsigned generation;
+		mutable unsigned generation = 0;
 
 		BoundProgramData(const ProgramData *);
 	};
 
 	struct State
 	{
-		const Camera *camera;
+		const Camera *camera = 0;
 		Matrix model_matrix;
-		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;
-		unsigned object_lod_bias;
-
-		State();
+		const Framebuffer *framebuffer = 0;
+		const Rect *viewport = 0;
+		const Rect *scissor = 0;
+		unsigned texture_count = 0;
+		const Clipping *clipping = 0;
+		const Program *shprog = 0;
+		unsigned shdata_count = 0;
+		const VertexSetup *vertex_setup = 0;
+		FaceWinding front_face = NON_MANIFOLD;
+		CullMode face_cull = NO_CULL;
+		const DepthTest *depth_test = 0;
+		const StencilTest *stencil_test = 0;
+		const Blend *blend = 0;
+		unsigned object_lod_bias = 0;
 	};
 
 	enum ChangeMask
@@ -114,6 +117,7 @@ private:
 	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
 	PipelineState pipeline_state;
+	Commands commands;
 
 public:
 	Renderer();
@@ -133,6 +137,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 +170,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 +192,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();
 };