Require texture data to be uploaded in a format matching the storage

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 54fbc767bb77a75ce19356d446a7c38d13526b52..78a7fc168f13439bcfbeb7f772e125cdd6519493 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, 1);
-       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)
@@ -58,7 +50,7 @@ void ColorCurve::set_gamma(float g)
        unsigned char curve_data[256];
        for(unsigned i=0; i<256; ++i)
                curve_data[i] = pow(i/255.0f, 1/g)*255+0.5f;
-       curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
+       curve.image(0, curve_data);
 }
 
 void ColorCurve::set_srgb()
@@ -67,7 +59,7 @@ void ColorCurve::set_srgb()
        curve_data[0] = 0;
        for(unsigned i=1; i<256; ++i)
                curve_data[i] = to_srgb(i/255.0f)*255+0.5f;
-       curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
+       curve.image(0, curve_data);
 }
 
 void ColorCurve::set_linear()
@@ -75,7 +67,7 @@ void ColorCurve::set_linear()
        unsigned char curve_data[256];
        for(unsigned i=0; i<256; ++i)
                curve_data[i] = i;
-       curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
+       curve.image(0, curve_data);
 }
 
 void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)