Rework ProgramData to do less unnecessary work

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

diff --git a/source/shadowmap.cpp b/source/shadowmap.cpp
index 8151a7cffe48c41429005470ac3595916fb309e1..7575051e6e7d956e89299a8eed47db54ca8f9546 100644 (file)
--- a/source/shadowmap.cpp
+++ b/source/shadowmap.cpp
@@ -104,7 +104,7 @@ void ShadowMap::setup_frame() const
        shadow_matrix.translate(-0.5, -0.5, depth_bias/size-0.5);
        shadow_matrix.invert();
 
-       Bind bind_fbo(fbo, true);
+       BindRestore bind_fbo(fbo);
        Bind bind_depth(DepthTest::lequal());
        fbo.clear(DEPTH_BUFFER_BIT);
        renderable.render("shadow");
@@ -128,7 +128,7 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
        shdata.uniform("shadow", iunit);
        shdata.uniform("shadow_unit", iunit);
 
-       depth_buf.bind_to(unit);
+       Bind _bind_depth(depth_buf, unit);
        TexGen tg_s, tg_t, tg_r;
        tg_s.set_plane(Vector4(shadow_matrix(0, 0), shadow_matrix(0, 1), shadow_matrix(0, 2), shadow_matrix(0, 3)));
        tg_t.set_plane(Vector4(shadow_matrix(1, 0), shadow_matrix(1, 1), shadow_matrix(1, 2), shadow_matrix(1, 3)));
@@ -147,7 +147,6 @@ void ShadowMap::render(Renderer &renderer, const Tag &tag) const
        renderer.add_shader_data(shdata);
        renderer.render(renderable, tag);
 
-       Texture::unbind_from(unit);
        TexGen::unbind_from(unit, SCOORD);
        TexGen::unbind_from(unit, TCOORD);
        TexGen::unbind_from(unit, RCOORD);