Deprecate external access to Renderer::flush_shader_data

[libs/gl.git] / source / render / renderer.cpp

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 2da4bd78f4969a016ee71099ac2655567ca051f0..8de24adbbca8aee385a5ddab15941b50ee41b9e6 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -147,14 +147,14 @@ unsigned Renderer::allocate_effect_texunit()
 
 void Renderer::set_material(const Material *m)
 {
-       state->material = m;
-       changed |= MATERIAL_SHDATA;
+       if(m)
+               add_shader_data(m->get_shader_data());
 }
 
 void Renderer::set_lighting(const Lighting *l)
 {
-       state->lighting = l;
-       changed |= LIGHTING_SHDATA;
+       if(l)
+               add_shader_data(l->get_shader_data());
 }
 
 void Renderer::set_clipping(const Clipping *c)
@@ -182,13 +182,13 @@ void Renderer::add_shader_data(const ProgramData &d)
                }
        }
 
-       flush_shader_data();
+       flush_shader_data_();
        shdata_stack.push_back(&d);
        state->shdata_count = shdata_stack.size();
        changed |= SHADER_DATA;
 }
 
-void Renderer::flush_shader_data()
+void Renderer::flush_shader_data_()
 {
        if(shdata_stack.size()>state->shdata_count)
                shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
@@ -226,7 +226,6 @@ void Renderer::pop_state()
                throw stack_underflow("Renderer::pop_state");
 
        const Camera *old_camera = state->camera;
-       const Lighting *old_lighting = state->lighting;
        const Clipping *old_clipping = state->clipping;
        state_stack.pop_back();
        state = &state_stack.back();
@@ -234,8 +233,6 @@ void Renderer::pop_state()
        bool camera_changed = (state->camera!=old_camera);
        if(camera_changed)
                changed |= CAMERA_SHDATA;
-       if(state->lighting!=old_lighting)
-               changed |= LIGHTING_SHDATA;
        if(state->clipping!=old_clipping)
                changed |= CLIPPING_SHDATA;
 }
@@ -341,18 +338,6 @@ void Renderer::apply_state()
                changed &= ~CAMERA_SHDATA;
        }
 
-       if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))
-       {
-               state->material->get_shader_data().apply();
-               changed &= ~MATERIAL_SHDATA;
-       }
-
-       if(state->lighting && ((changed&LIGHTING_SHDATA) || shprog_changed))
-       {
-               state->lighting->get_shader_data().apply();
-               changed &= ~LIGHTING_SHDATA;
-       }
-
        if(state->clipping && ((changed&CLIPPING_SHDATA) || shprog_changed))
        {
                state->clipping->get_shader_data().apply();
@@ -417,8 +402,6 @@ Renderer::State::State():
        camera(0),
        texture_count(0),
        lowest_effect_texunit(TexUnit::get_n_units()),
-       material(0),
-       lighting(0),
        clipping(0),
        shprog(0),
        shdata_count(0),