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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 8026f5ab..42515e82 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,7 +4,6 @@
 #include <set>
 #include <vector>
 #include "commands.h"
-#include "framebuffer.h"
 #include "matrix.h"
 #include "pipelinestate.h"
 #include "programdata.h"
@@ -16,11 +15,12 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
-class Clipping;
+union ClearValue;
 class Material;
 class Mesh;
 class Lighting;
 class Program;
+class QueryPool;
 class Renderable;
 class Sampler;
 class Texture;
@@ -68,42 +68,37 @@ 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;
-		const Framebuffer *framebuffer;
-		const Rect *viewport;
-		const Rect *scissor;
-		unsigned texture_count;
-		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();
+		const Framebuffer *framebuffer = 0;
+		const Rect *viewport = 0;
+		const Rect *scissor = 0;
+		unsigned texture_count = 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
@@ -153,7 +148,6 @@ public:
 	DEPRECATED void set_material(const Material *);
 
 	DEPRECATED void set_lighting(const Lighting *);
-	void set_clipping(const Clipping *);
 
 	/** Sets the shader program to use.  An initial set of data can be set as
 	well, with the same semantics as add_shader_data. */
@@ -201,7 +195,10 @@ public:
 	void draw(const Batch &);
 	void draw_instanced(const Batch &, unsigned);
 
-	void resolve_multisample(Framebuffer &, BufferBits);
+	void resolve_multisample(Framebuffer &);
+
+	void begin_query(const QueryPool &, unsigned);
+	void end_query(const QueryPool &, unsigned);
 
 private:
 	void apply_state();