X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=dd9464127d025ee0ae4ba9612084f91617f8ad67;hb=d41ec7dfaa635bbaea9e902d5f5c60bd4a887891;hp=1be1a4549211828d8b3dedfeea7898a4c0a526b3;hpb=db2fd517dcd215e9d16345287d413f2a64f5ba03;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 1be1a454..dd946412 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -89,15 +89,24 @@ private:
 		virtual void update();
 	};
 
+	enum ChangeMask
+	{
+		LEGACY_MATRIX = 1,
+		MODERN_MATRIX = 2,
+		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
+		LIGHTING = 4,
+		SHADER_DATA = 8
+	};
+
 	MtxStack mtx_stack;
-	bool mtx_changed;
+	unsigned char changed;
+	bool matrices_loaded;
+	unsigned shdata_applied;
 	const Camera *camera;
 	std::vector<State> state_stack;
 	State *state;
-	bool lighting_changed;
 	ProgramData standard_shdata;
 	std::vector<const ProgramData *> shdata_stack;
-	bool shdata_changed;
 	const Buffer *element_buffer;
 	std::set<const Renderable *> excluded;
 
@@ -139,9 +148,13 @@ public:
 
 	/** Prepares for temporarily bypassing the Renderer by synchronizing the
 	current state with GL.  No additional call is necessary to resume using the
-	Renderer. */
+	Renderer.  DEPRECATED. */
 	void escape();
 
+	/** Ends rendering, unbinding all objects and resetting state.  There must
+	be no unpopped state in the stack. */
+	void end();
+
 	void exclude(const Renderable &);
 	void include(const Renderable &);