Tweak the shader functions in Renderer

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

diff --git a/source/renderer.cpp b/source/renderer.cpp
index ee845e08b12d18d66c864cf936b3b48a8eae935f..c751b0e3629d77b8bd93fee9aa4049f3a75cc57f 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -68,22 +68,17 @@ 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;
 }