Separate abstract pixel compositions from concrete pixel formats

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 40f61b813dd088171beeea361b92dc91dac11a6e..1f6f7bf9ec1f77df01f8db326b4bafa9c5e94ce8 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -18,9 +18,10 @@ ColorCurve::ColorCurve():
        shdata.uniform("source", 0);
        shdata.uniform("curve", 1);
 
-       curve.storage(LUMINANCE, 256);
-       curve.set_min_filter(LINEAR);
-       curve.set_wrap(CLAMP_TO_EDGE);
+       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);
 
        set_exposure_adjust(0.0f);
@@ -41,15 +42,6 @@ void ColorCurve::set_brightness_response(float b)
        shdata.uniform("brightness_response", b, t, pow(t, b));
 }
 
-void ColorCurve::set_peak(float)
-{
-}
-
-void ColorCurve::set_brightness(float b)
-{
-       set_brightness_response(1/b);
-}
-
 void ColorCurve::set_gamma(float g)
 {
        if(g<0.1 || g>10)