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 8983df2bb7fb1b943d88decca8305cff95c176f5..78a7fc168f13439bcfbeb7f772e125cdd6519493 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -18,7 +18,7 @@ ColorCurve::ColorCurve():
        shdata.uniform("source", 0);
        shdata.uniform("curve", 1);
 
-       curve.storage(LUMINANCE, 256, 1);
+       curve.storage(LUMINANCE8, 256, 1);
        Sampler &sampler = curve.get_default_sampler();
        sampler.set_min_filter(LINEAR);
        sampler.set_wrap(CLAMP_TO_EDGE);
@@ -50,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()
@@ -59,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()
@@ -67,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 &)