X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fenvironmentmap.cpp;h=5002e0f88b786ae90440fb7e3e3b9a0aa487562e;hp=465e4fee74fc65dd2ab462710c46ac2f6922d45e;hb=cd5f37b066352119cf92d53d0001af7ff99be437;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 465e4fee..5002e0f8 100644
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -57,13 +57,12 @@ void EnvironmentMap::init(unsigned s, PixelFormat f, unsigned l)
 	update_delay = 0;
 
 	env_tex.storage(f, size, l);
-	depth_buf.storage(DEPTH_COMPONENT32F, size, size);
+	depth_buf.storage(DEPTH_COMPONENT32F, size, size, 1);
 	for(unsigned i=0; i<6; ++i)
 	{
 		TextureCubeFace face = TextureCube::enumerate_faces(i);
 		faces[i].fbo.attach(COLOR_ATTACHMENT0, env_tex, face, 0);
 		faces[i].fbo.attach(DEPTH_ATTACHMENT, depth_buf);
-		faces[i].fbo.require_complete();
 		faces[i].camera.set_look_direction(TextureCube::get_face_direction(face));
 		faces[i].camera.set_up_direction(TextureCube::get_t_direction(face));
 		faces[i].camera.set_field_of_view(Geometry::Angle<float>::right());
@@ -143,17 +142,16 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 
 	Vector3 center = matrix->column(3).slice<3>(0);
 
-	BindRestore bind_fbo(faces[0].fbo);
 	for(unsigned i=0; i<6; ++i)
 	{
 		faces[i].camera.set_position(center);
-		faces[i].fbo.bind();
-		faces[i].fbo.clear();
+		renderer.set_framebuffer(&faces[i].fbo);
+		renderer.clear();
 		renderer.set_camera(faces[i].camera);
 		renderer.render(environment);
 	}
 
-	irradiance_fbo.bind();
+	renderer.set_framebuffer(&irradiance_fbo);
 	renderer.set_shader_program(&irradiance_shprog, &prefilter_shdata);
 	renderer.set_texture("environment_map", &env_tex, &sampler);
 	fullscreen_mesh.draw(renderer);
@@ -162,7 +160,7 @@ void EnvironmentMap::setup_frame(Renderer &renderer)
 	for(unsigned i=0; i<specular_fbos.size(); ++i)
 	{
 		prefilter_shdata.uniform("roughness", 1.0f-sqrt(1.0f-static_cast<float>(i+1)/specular_fbos.size()));
-		specular_fbos[i].bind();
+		renderer.set_framebuffer(&specular_fbos[i]);
 		fullscreen_mesh.draw(renderer);
 	}
 }