Overhaul texture management in rendering classes

[libs/gl.git] / source / effects / bloom.cpp

diff --git a/source/effects/bloom.cpp b/source/effects/bloom.cpp
index 1e39c68632002b29718be21a4949f8f2b8d812d9..98afedfc17c924e1e1b1048488dd0e72497ce4dc 100644 (file)
--- a/source/effects/bloom.cpp
+++ b/source/effects/bloom.cpp
@@ -27,11 +27,6 @@ Bloom::Bloom(Resources &resources, unsigned w, unsigned h):
        for(unsigned i=0; i<2; ++i)
                target[i] = new RenderTarget(w, h, (RENDER_COLOR,RGB16F));
 
-       common_shdata.uniform("source", 0);
-       common_shdata.uniform("blurred", 1);
-
-       combine_texturing.attach(1, target[1]->get_target_texture(RENDER_COLOR), &linear_sampler);
-
        set_radius(2.0f);
        set_strength(0.2f);
 }
@@ -76,13 +71,13 @@ void Bloom::render(Renderer &renderer, const Texture2D &src, const Texture2D &)
        {
                BindRestore bind_fbo(target[i]->get_framebuffer());
                Renderer::Push push2(renderer);
-               renderer.set_texture(i ? &target[0]->get_target_texture(RENDER_COLOR) : &src, &nearest_sampler);
+               renderer.set_texture("source", (i ? &target[0]->get_target_texture(RENDER_COLOR) : &src), &nearest_sampler);
                renderer.add_shader_data(blur_shdata[i]);
                quad.draw(renderer);
        }
 
-       combine_texturing.attach(0, src, &nearest_sampler);
-       renderer.set_texturing(&combine_texturing);
+       renderer.set_texture("source", &src, &nearest_sampler);
+       renderer.set_texture("blurred", &target[1]->get_target_texture(RENDER_COLOR), &linear_sampler);
        renderer.set_shader_program(&combine_shader);
        quad.draw(renderer);
 }