Handle all shader data in Renderer through the generic mechanism

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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 2da4bd78f4969a016ee71099ac2655567ca051f0..1d43a939432f9a593381992824aedec7fca87f84 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -2,6 +2,7 @@
 #include "buffer.h"
 #include "camera.h"
 #include "clipping.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "lighting.h"
 #include "material.h"
@@ -43,6 +44,7 @@ void Renderer::init()
        state_stack.push_back(State());
        shdata_stack.reserve(32);
        state = &state_stack.back();
+       add_shader_data(standard_shdata);
 }
 
 Renderer::~Renderer()
@@ -53,7 +55,7 @@ Renderer::~Renderer()
 void Renderer::set_camera(const Camera &c)
 {
        state->camera = &c;
-       changed |= CAMERA_SHDATA;
+       add_shader_data(c.get_shader_data());
        set_matrix(Matrix());
 }
 
@@ -147,20 +149,21 @@ 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)
 {
        state->clipping = c;
-       changed |= CLIPPING_SHDATA;
+       if(c)
+               add_shader_data(c->get_shader_data());
 }
 
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
@@ -182,13 +185,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());
@@ -225,19 +228,9 @@ void Renderer::pop_state()
        if(state_stack.size()==1)
                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();
        changed |= MATRIX;
-       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;
 }
 
 void Renderer::end()
@@ -332,37 +325,7 @@ void Renderer::apply_state()
                LinAl::SquareMatrix<float, 3> nm = state->model_matrix.block<3, 3>(0, 0);
                nm = transpose(invert(nm));
                standard_shdata.uniform("world_obj_normal_matrix", nm);
-               changed = (changed&~MATRIX)|STANDARD_SHDATA;
-       }
-
-       if(state->camera && ((changed&CAMERA_SHDATA) || shprog_changed))
-       {
-               state->camera->get_shader_data().apply();
-               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();
-               changed &= ~CLIPPING_SHDATA;
-       }
-
-       if((changed&STANDARD_SHDATA) || shprog_changed)
-       {
-               standard_shdata.apply();
-               changed &= ~STANDARD_SHDATA;
+               changed &= ~MATRIX;
        }
 
        bool shdata_changed = changed&SHADER_DATA;
@@ -416,9 +379,7 @@ Renderer::BoundProgramData::BoundProgramData(const ProgramData *d):
 Renderer::State::State():
        camera(0),
        texture_count(0),
-       lowest_effect_texunit(TexUnit::get_n_units()),
-       material(0),
-       lighting(0),
+       lowest_effect_texunit(Limits::get_global().max_texture_bindings),
        clipping(0),
        shprog(0),
        shdata_count(0),