X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=489cebb8f407b1f1cd8f4f76db9d5cbe39905580;hb=c5583e23cc7b064ac28f2b2b6993d1e5fa415d5b;hp=27087197690fca5bd7da7e784dc2fd11f5b88a13;hpb=82282de52e8e8f3bbafefaf92bf76f53f2c2495e;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 27087197..489cebb8 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -89,8 +89,6 @@ private:
 		Matrix model_matrix;
 		unsigned texture_count;
 		unsigned lowest_effect_texunit;
-		const Material *material;
-		const Lighting *lighting;
 		const Clipping *clipping;
 		const Program *shprog;
 		unsigned shdata_count;
@@ -106,8 +104,9 @@ private:
 	{
 		MATRIX = 2,
 		SHADER_DATA = 16,
-		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64
+		STANDARD_SHDATA = 64,
+		CAMERA_SHDATA = 128,
+		CLIPPING_SHDATA = 512
 	};
 
 	const Camera *default_camera;
@@ -152,9 +151,9 @@ public:
 	DEPRECATED void set_texturing(const Texturing *);
 	DEPRECATED unsigned allocate_effect_texunit();
 #pragma GCC diagnostic pop
-	void set_material(const Material *);
+	DEPRECATED void set_material(const Material *);
 
-	void set_lighting(const Lighting *);
+	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
@@ -166,8 +165,11 @@ 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);