Copy ProgramData::uniform_slots in copy constructor and operator=

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

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index c02daf52a6942cd24af3a6c5dc34dd578419da43..f42069bebae007ed15105e34536dada4a98eec98 100644 (file)
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -81,6 +81,7 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float depth_ratio):
        occlusion.set_mag_filter(NEAREST);
        occlusion.set_wrap(CLAMP_TO_EDGE);
        fbo.attach(COLOR_ATTACHMENT0, occlusion, 0);
+       fbo.require_complete();
 
        combine_texturing.attach(2, occlusion);
 
@@ -134,11 +135,11 @@ void AmbientOcclusion::render(const Texture2D &color, const Texture2D &depth)
        combine_texturing.attach(0, depth);
        combine_texturing.attach(1, color);
 
-       Bind unbind_dtest(static_cast<DepthTest *>(0), true);
-       Bind unbind_blend(static_cast<Blend *>(0), true);
+       BindRestore unbind_dtest(static_cast<DepthTest *>(0));
+       BindRestore unbind_blend(static_cast<Blend *>(0));
 
        {
-               Bind bind_fbo(fbo, true);
+               BindRestore bind_fbo(fbo);
                Bind bind_tex(occlude_texturing);
                Bind bind_shader(occlude_shader);
                occlude_shdata.apply();