X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.h;h=dd54ca1691dfaf49233608ff85f2ff5de9e69440;hp=d8ace373805e9b85f905033d01a449709af11cf9;hb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;hpb=635d00bc1a9ba43ef1224681a14d0710a098cf87

diff --git a/source/renderer.h b/source/renderer.h
index d8ace373..dd54ca16 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_RENDERER_H_
 #define MSP_GL_RENDERER_H_
 
@@ -31,7 +24,9 @@ particular, Objects and Scenes) can by rendered without a Renderer, using one
 will often be more efficient.  This is especially true for ObjectInstances.
 
 The Renderer works by deferring GL state changes until something is actually
-being drawn.  This avoids many unnecessary GL calls. */
+being drawn.  This avoids many unnecessary GL calls if consecutive renderables
+use the same resources.
+*/
 class Renderer
 {
 public:
@@ -53,6 +48,7 @@ private:
 		const Material *material;
 		const Program *shprog;
 		std::vector<const ProgramData *> shdata;
+		const WindingTest *winding_test;
 
 		State();
 	};
@@ -76,7 +72,7 @@ private:
 	const VertexArray *vertex_array;
 	bool vertex_array_changed;
 	const Buffer *element_buffer;
-	const WindingTest *winding_test;
+	bool shdata_changed;
 
 public:
 	Renderer(const Camera *);
@@ -98,7 +94,9 @@ public:
 	void push_state();
 	void pop_state();
 
-	/** Prepares for temporarily bypassing the Renderer. */
+	/** Prepares for temporarily bypassing the Renderer by synchronizing the
+	current state with GL.  No additional call is necessary to resume using the
+	Renderer. */
 	void escape();
 
 	void draw(const Batch &);