X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=42515e822993b622a163d5eb454359bf0a86f145;hb=00dc5da40385d41c3a50c34c75353b257e814035;hp=af9eac0426e4c265a76bd2dc54879a5f85b636c3;hpb=5bb193f930fb8738d099d630c4d625d82c1215b5;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index af9eac04..42515e82 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -16,7 +16,6 @@ class Batch;
 class Buffer;
 class Camera;
 union ClearValue;
-class Clipping;
 class Material;
 class Mesh;
 class Lighting;
@@ -69,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
@@ -154,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. */