Tweak the shader functions in Renderer

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 03042e67c12f80ac95904ca4c66e8f4e80e6baee..c751b0e3629d77b8bd93fee9aa4049f3a75cc57f 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -68,21 +68,18 @@ void Renderer::set_material(const Material *m)
        state->material = m;
 }
 
-void Renderer::set_shader(const Program *p, const ProgramData *d)
+void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 {
        state->shprog = p;
-       if(d)
-               state->shdata.assign(1, d);
-       else
-               state->shdata.clear();
+       if(p && d)
+               add_shader_data(*d);
+       shdata_changed = true;
 }
 
-void Renderer::add_shader_data(const ProgramData *d)
+void Renderer::add_shader_data(const ProgramData &d)
 {
-       if(!state->shprog)
-               throw invalid_operation("Renderer::add_shader_data");
-
-       state->shdata.push_back(d);
+       state->shdata.push_back(&d);
+       shdata_changed = true;
 }
 
 void Renderer::set_vertex_array(const VertexArray *a)
@@ -117,6 +114,7 @@ void Renderer::pop_state()
        state = &state_stack.back();
        mtx_stack.pop();
        mtx_changed = true;
+       shdata_changed = true;
 }
 
 void Renderer::escape()
@@ -170,8 +168,12 @@ void Renderer::apply_state()
        if(state->shprog)
        {
                state->shprog->bind();
-               for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
-                       (*i)->apply();
+               if(shdata_changed)
+               {
+                       for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
+                               (*i)->apply();
+                       shdata_changed = false;
+               }
        }
        else
                Program::unbind();