Always bind textures in a specific texture unit

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

diff --git a/source/environmentmap.cpp b/source/environmentmap.cpp
index 8cda8cbae63b7e7505dd26a1c73d17dfc4ee4db0..be0bf4109f9c64e6f27796ab1c5b865385624fd1 100644 (file)
--- a/source/environmentmap.cpp
+++ b/source/environmentmap.cpp
@@ -20,10 +20,11 @@ EnvironmentMap::EnvironmentMap(unsigned s, Renderable &r, Renderable &e):
        {
                fbo[i].attach(COLOR_ATTACHMENT0, env_tex, TextureCube::enumerate_faces(i), 0);
                fbo[i].attach(DEPTH_ATTACHMENT, depth_buf);
+               fbo[i].require_complete();
        }
 
        // XXX Make the depth range configurable
-       camera.set_field_of_view(M_PI/2);
+       camera.set_field_of_view(Geometry::Angle<float>::right());
        camera.set_aspect(1);
        camera.set_depth_clip(0.1, 100);
 
@@ -86,14 +87,12 @@ void EnvironmentMap::render(Renderer &renderer, const Tag &tag) const
        shdata.uniform_matrix3("env_eye_matrix", env_mdata);
 
        env_tex.bind_to(4);
-       TexUnit::activate(0);
 
        Renderer::Push _push_rend(renderer);
        renderer.add_shader_data(shdata);
        renderer.render(renderable, tag);
 
        env_tex.unbind_from(4);
-       TexUnit::activate(0);
 }
 
 } // namespace GL