X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fshaders.cpp;h=1b9c64724f78bd394ab9051458bfcfe496136d63;hb=2e6a73a93eac0a18063ec675a24a8e6eeeb80a0c;hp=ae5c98fbb727cd42e4259a44d446148dc9b56d47;hpb=9846a5c6e73b3a146084894a11550dbbf184a22a;p=libs%2Fgl.git

diff --git a/demos/shaders.cpp b/demos/shaders.cpp
index ae5c98fb..1b9c6472 100644
--- a/demos/shaders.cpp
+++ b/demos/shaders.cpp
@@ -83,6 +83,7 @@ int main()
 	}
 
 	GL::ProgramData progdata;
+	progdata.uniform("texture", 0);
 	progdata.uniform("normalmap", 1);
 
 	GL::Lighting lighting;
@@ -112,10 +113,11 @@ int main()
 			GL::Renderer renderer(0);
 			renderer.set_material(&mat);
 			renderer.set_texturing(&texturing);
+			renderer.add_shader_data(progdata);
 			for(unsigned i=0; i<12; ++i)
 			{
 				GL::MatrixStack::Push push(renderer.matrix_stack());
-				renderer.set_shader(programs[i], &progdata);
+				renderer.set_shader_program(programs[i]);
 				renderer.matrix_stack() *= GL::Matrix::translation(-3.3+(i%4)*2.2, 0, -3.5+(i/4)*3.0);
 				renderer.matrix_stack() *= GL::Matrix::rotation(angle, 0, 0, 1);
 				mesh.draw(renderer);