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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 50254cdf..ee48b910 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,8 @@ private:
 		const Program *shprog;
 		unsigned shdata_count;
 		const VertexSetup *vertex_setup;
-		const WindingTest *winding_test;
-		bool reverse_winding;
+		FaceWinding front_face;
+		CullMode face_cull;
 		unsigned object_lod_bias;
 
 		State();
@@ -106,7 +106,6 @@ private:
 		SHADER_DATA = 16
 	};
 
-	const Camera *default_camera;
 	unsigned char changed;
 	std::vector<State> state_stack;
 	State *state;
@@ -114,13 +113,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. */
@@ -139,15 +135,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 *);
@@ -168,8 +157,8 @@ private:
 
 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_object_lod_bias(unsigned);
 	unsigned get_object_lod_bias() const { return state->object_lod_bias; }