X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=c751b0e3629d77b8bd93fee9aa4049f3a75cc57f;hp=ee845e08b12d18d66c864cf936b3b48a8eae935f;hb=0c731643d6363eb4c492e836ffb919cb7c0a3035;hpb=41b4cb3002f3551ce1bd6fdf15994ee7bc523788

diff --git a/source/renderer.cpp b/source/renderer.cpp
index ee845e08..c751b0e3 100644
--- 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;
 }