Always update program uniforms if uniform names have changed

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

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index 278720cec48fac4903661f4f52010fa99a3b19b1..73736312726ac7013e864ff4e26309ea10082980 100644 (file)
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -70,16 +70,20 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float depth_ratio):
 {
        occlude_shader.attach_shader(get_fullscreen_vertex_shader());
        occlude_shader.attach_shader_owned(new FragmentShader(occlude_fs));
+       occlude_shader.bind_attribute(get_component_type(VERTEX2), "vertex");
        occlude_shader.link();
 
        combine_shader.attach_shader(get_fullscreen_vertex_shader());
        combine_shader.attach_shader_owned(new FragmentShader(combine_fs));
+       combine_shader.bind_attribute(get_component_type(VERTEX2), "vertex");
        combine_shader.link();
 
        occlusion.storage(RGB, w, h);
        occlusion.set_min_filter(NEAREST);
        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);
 
@@ -133,11 +137,12 @@ 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_mesh(quad);
 
        {
-               Bind bind_fbo(fbo, true);
+               BindRestore bind_fbo(fbo);
                Bind bind_tex(occlude_texturing);
                Bind bind_shader(occlude_shader);
                occlude_shdata.apply();