]> git.tdb.fi Git - libs/gl.git/blobdiff - source/effects/colorcurve.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / effects / colorcurve.cpp
index 697a0583de0c43df6fc37f7408823c4ec74f3388..ac1ed9aa64bac9d50b3910c14c0356658afd782b 100644 (file)
@@ -4,7 +4,6 @@
 #include "mesh.h"
 #include "renderer.h"
 #include "resources.h"
-#include "shader.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -70,6 +69,8 @@ void ColorCurve::set_linear()
 void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)
 {
        Renderer::Push push(renderer);
+       renderer.set_pipeline_key(this);
+       renderer.clear(0);
        renderer.set_shader_program(&shprog, &shdata);
        renderer.set_texture("source", &color_buf, &nearest_sampler);
        renderer.set_texture("curve", &curve, &linear_sampler);
@@ -80,20 +81,13 @@ void ColorCurve::set_debug_name(const string &name)
 {
 #ifdef DEBUG
        shdata.set_debug_name(name+" [UBO]");
-       curve.set_debug_name(name+"/curve.tex1d");
+       curve.set_debug_name(name+"/curve.tex");
 #else
        (void)name;
 #endif
 }
 
 
-ColorCurve::Template::Template():
-       exposure_adjust(0.0f),
-       brightness_response(0.4f),
-       gamma(1.0f),
-       srgb(false)
-{ }
-
 ColorCurve *ColorCurve::Template::create(unsigned, unsigned) const
 {
        RefPtr<ColorCurve> colorcurve = new ColorCurve();