Remove the deprecated ProgramBuilder class

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 78a7fc168f13439bcfbeb7f772e125cdd6519493..8811b065fd3b6f0dddddd86a8e091e08d97bc224 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -13,16 +13,15 @@ namespace GL {
 
 ColorCurve::ColorCurve():
        shprog("colorcurve.glsl"),
-       quad(get_fullscreen_quad())
+       quad(get_fullscreen_quad()),
+       linear_sampler(get_linear_sampler()),
+       nearest_sampler(get_nearest_sampler())
 {
        shdata.uniform("source", 0);
        shdata.uniform("curve", 1);
 
        curve.storage(LUMINANCE8, 256, 1);
-       Sampler &sampler = curve.get_default_sampler();
-       sampler.set_min_filter(LINEAR);
-       sampler.set_wrap(CLAMP_TO_EDGE);
-       texturing.attach(1, curve);
+       texturing.attach(1, curve, linear_sampler.get());
 
        set_exposure_adjust(0.0f);
        set_brightness_response(0.4f);
@@ -72,12 +71,12 @@ void ColorCurve::set_linear()
 
 void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)
 {
-       texturing.attach(0, color_buf);
+       texturing.attach(0, color_buf, nearest_sampler.get());
 
        Renderer::Push push(renderer);
        renderer.set_shader_program(&shprog, &shdata);
        renderer.set_texturing(&texturing);
-       quad.draw(renderer);
+       quad->draw(renderer);
 }