X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=dd732bd8d491150375c929ea065c225b654f6ff0;hb=fd18332856ddd03f79a54dd034d53cb0a384335d;hp=973e1b00263330101aca291ccef3c38a75e5e82c;hpb=2341b3575c874b1960814264fa759ad584bf3134;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 973e1b00..dd732bd8 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -77,7 +77,6 @@ private:
 		Matrix clipping_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
-		const Mesh *mesh;
 		const VertexSetup *vertex_setup;
 		const WindingTest *winding_test;
 		bool reverse_winding;
@@ -88,20 +87,14 @@ private:
 
 	enum ChangeMask
 	{
-		LEGACY_MATRIX = 1,
-		MODERN_MATRIX = 2,
-		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-		LEGACY_LIGHTING = 4,
-		LEGACY_CLIPPING = 8,
+		MATRIX = 2,
 		SHADER_DATA = 16,
 		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64,
-		LEGACY_PROJECTION = 128
+		STANDARD_SHDATA = 64
 	};
 
 	const Camera *default_camera;
 	unsigned char changed;
-	bool matrices_loaded;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
@@ -151,7 +144,8 @@ public:
 	Renderer state is popped. */
 	void add_shader_data(const ProgramData &data);
 
-	void set_mesh(const Mesh *);
+	void flush_shader_data();
+
 	void set_vertex_setup(const VertexSetup *);
 	void set_winding_test(const WindingTest *);
 	void set_reverse_winding(bool);