X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=01c17a26ef8cc3ce5019bea833a3224e7c54e19c;hb=ccbfdfa0d9d796244b1ecc0fa3faa2c50304811b;hp=3ddb3a6553acd3e1c9ae1593d40dc639e7a07ece;hpb=b781d8d1d713e28ec21a66a9d78eb3fc01f327e5;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 3ddb3a65..01c17a26 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -104,7 +104,7 @@ void Renderer::set_lighting(const Lighting *l)
 		l->update_shader_data(standard_shdata, mtx_stack.top());
 		changed |= STANDARD_SHDATA;
 	}
-	changed |= LIGHTING;
+	changed |= LEGACY_LIGHTING;
 }
 
 void Renderer::set_clipping(const Clipping *c)
@@ -113,7 +113,7 @@ void Renderer::set_clipping(const Clipping *c)
 	state->clipping_matrix = mtx_stack.top();
 	if(c)
 		c->update_shader_data(standard_shdata, mtx_stack.top());
-	changed |= CLIPPING;
+	changed |= LEGACY_CLIPPING;
 }
 
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
@@ -173,13 +173,13 @@ void Renderer::pop_state()
 	{
 		if(state->lighting)
 			state->lighting->update_shader_data(standard_shdata, state->lighting_matrix);
-		changed |= LIGHTING;
+		changed |= LEGACY_LIGHTING;
 	}
 	if(state->clipping!=old_clipping)
 	{
 		if(state->clipping)
 			state->clipping->update_shader_data(standard_shdata, state->clipping_matrix);
-		changed |= CLIPPING;
+		changed |= LEGACY_CLIPPING;
 	}
 }
 
@@ -265,13 +265,13 @@ void Renderer::apply_state()
 		else
 			Material::unbind();
 
-		if(changed&LIGHTING)
+		if(changed&LEGACY_LIGHTING)
 		{
 			if(state->lighting)
 			{
 				MatrixStack::modelview() = state->lighting_matrix;
 				state->lighting->bind();
-				changed = (changed&~LIGHTING)|LEGACY_MATRIX;
+				changed = (changed&~LEGACY_LIGHTING)|LEGACY_MATRIX;
 			}
 			else
 				Lighting::unbind();
@@ -282,11 +282,11 @@ void Renderer::apply_state()
 	{
 		if(legacy_bindings)
 		{
-			if(changed&CLIPPING)
+			if(changed&LEGACY_CLIPPING)
 			{
 				MatrixStack::modelview() = state->clipping_matrix;
 				state->clipping->bind(true);
-				changed = (changed&~CLIPPING)|LEGACY_MATRIX;
+				changed = (changed&~LEGACY_CLIPPING)|LEGACY_MATRIX;
 			}
 		}
 		else