Remove the deprecated ProgramBuilder class

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

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index b1dccc0e4c632ea8dd55ad5390c7fea5135413d4..8c1dd616c4b53ba40b49aea69bfd237bd89e1b17 100644 (file)
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -15,14 +15,14 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
        occlude_target(w, h, (RENDER_COLOR,R8)),
        occlude_shader("ambientocclusion_occlude.glsl"),
        combine_shader("ambientocclusion_combine.glsl"),
-       quad(get_fullscreen_quad())
+       quad(get_fullscreen_quad()),
+       linear_sampler(get_linear_sampler()),
+       nearest_sampler(get_nearest_sampler())
 {
-       occlude_target.set_texture_filter(LINEAR);
-       texturing.attach(2, occlude_target.get_target_texture(RENDER_COLOR));
+       texturing.attach(2, occlude_target.get_target_texture(RENDER_COLOR), linear_sampler.get());
 
        unsigned seed = 1;
        rotate_lookup.storage(RGBA8, 4, 4, 1);
-       rotate_lookup.get_default_sampler().set_filter(NEAREST);
        unsigned char data[64];
        for(unsigned i=0; i<16; ++i)
        {
@@ -34,9 +34,9 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float):
                data[i*4+2] = 255-s;
                data[i*4+3] = ((i+i/4)%2)*255;
        }
-       rotate_lookup.image(0, RGBA, UNSIGNED_BYTE, data);
+       rotate_lookup.image(0, data);
 
-       texturing.attach(3, rotate_lookup);
+       texturing.attach(3, rotate_lookup, nearest_sampler.get());
 
        shdata.uniform("source", 0);
        shdata.uniform("depth", 1);
@@ -91,8 +91,8 @@ void AmbientOcclusion::set_edge_depth_threshold(float edt)
 
 void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const Texture2D &depth)
 {
-       texturing.attach(0, color);
-       texturing.attach(1, depth);
+       texturing.attach(0, color, nearest_sampler.get());
+       texturing.attach(1, depth, nearest_sampler.get());
 
        if(renderer.get_camera())
                shdata.uniform("inverse_projection", invert(renderer.get_camera()->get_projection_matrix()));
@@ -103,11 +103,11 @@ void AmbientOcclusion::render(Renderer &renderer, const Texture2D &color, const
 
        {
                BindRestore bind_fbo(occlude_target.get_framebuffer());
-               quad.draw(renderer);
+               quad->draw(renderer);
        }
 
        renderer.set_shader_program(&combine_shader);
-       quad.draw(renderer);
+       quad->draw(renderer);
 }