X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fcubemap.cpp;h=512f519f260d619450dd9f60f938ec1f2db0dffa;hb=9034e81679eeeaa3d1d5d643d3f924d9edb45a68;hp=4f663055b8fc4ff68dce2c11b5c00bff484154cf;hpb=e87e7a542c2b9fcde1676ba17387fcfb5180f196;p=libs%2Fgl.git

diff --git a/demos/cubemap.cpp b/demos/cubemap.cpp
index 4f663055..512f519f 100644
--- a/demos/cubemap.cpp
+++ b/demos/cubemap.cpp
@@ -84,13 +84,13 @@ int main()
 	material.set_specular(GL::Color(1.0));
 	material.set_shininess(100);
 
-	GL::Program::StandardFeatures features;
+	GL::ProgramBuilder::StandardFeatures features;
 	features.lighting = true;
 	features.specular = true;
 	features.material = true;
 	features.reflection = true;
 	GL::Program shprog(features);
-	GL::ProgramData shdata(shprog);
+	GL::ProgramData shdata;
 	shdata.uniform("environment", 0);
 	shdata.uniform("reflectivity", 0.5f);
 
@@ -112,7 +112,7 @@ int main()
 			GL::Bind bind_depth(GL::DepthTest::lequal());
 			GL::Renderer renderer(0);
 			renderer.set_material(&material);
-			renderer.set_shader(&shprog, &shdata);
+			renderer.set_shader_program(&shprog, &shdata);
 			renderer.set_texture(&texture);
 			renderer.matrix_stack() *= GL::Matrix::translation(0, 0, -7);
 			{