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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 69474d40..23ced9e4 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "matrix.h"
+#include "pipelinestate.h"
 #include "programdata.h"
 #include "tag.h"
 
@@ -21,7 +22,6 @@ class Program;
 class Renderable;
 class Sampler;
 class Texture;
-class Texturing;
 class VertexSetup;
 class WindingTest;
 
@@ -93,8 +93,11 @@ private:
 		const Program *shprog;
 		unsigned shdata_count;
 		const VertexSetup *vertex_setup;
-		const WindingTest *winding_test;
-		bool reverse_winding;
+		FaceWinding front_face;
+		CullMode face_cull;
+		const DepthTest *depth_test;
+		const StencilTest *stencil_test;
+		const Blend *blend;
 		unsigned object_lod_bias;
 
 		State();
@@ -103,13 +106,9 @@ private:
 	enum ChangeMask
 	{
 		MATRIX = 2,
-		SHADER_DATA = 16,
-		STANDARD_SHDATA = 64,
-		CAMERA_SHDATA = 128,
-		CLIPPING_SHDATA = 512
+		SHADER_DATA = 16
 	};
 
-	const Camera *default_camera;
 	unsigned char changed;
 	std::vector<State> state_stack;
 	State *state;
@@ -117,13 +116,10 @@ private:
 	ProgramData standard_shdata;
 	std::vector<BoundProgramData> shdata_stack;
 	std::set<const Renderable *> excluded;
+	PipelineState pipeline_state;
 
 public:
 	Renderer();
-	DEPRECATED Renderer(const Camera *);
-private:
-	void init();
-public:
 	~Renderer();
 
 	/** Sets the camera to render from.  The model matrix is reset to identity. */
@@ -142,15 +138,8 @@ public:
 
 	void set_texture(Tag, const Texture *, const Sampler * = 0);
 private:
-	void set_texture(Tag, int, const Texture *, const Sampler *);
 	void flush_textures();
 public:
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	DEPRECATED void set_texture(const Texture *, const Sampler * = 0);
-	DEPRECATED void set_texturing(const Texturing *);
-	DEPRECATED unsigned allocate_effect_texunit();
-#pragma GCC diagnostic pop
 	DEPRECATED void set_material(const Material *);
 
 	DEPRECATED void set_lighting(const Lighting *);
@@ -165,11 +154,18 @@ public:
 	Renderer state is popped. */
 	void add_shader_data(const ProgramData &data);
 
-	void flush_shader_data();
+	DEPRECATED void flush_shader_data() { flush_shader_data_(); }
+private:
+	void flush_shader_data_();
 
+public:
 	void set_vertex_setup(const VertexSetup *);
-	void set_winding_test(const WindingTest *);
-	void set_reverse_winding(bool);
+	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; }