Deprecate Renderer::begin() and remove the already deprecated escape()

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

diff --git a/source/colorcurve.cpp b/source/colorcurve.cpp
index 6351ea20bb252c7402bf129e3115dcb6c7f24e5e..ad2c51ca337f35340974226253e706a58f58b088 100644 (file)
--- a/source/colorcurve.cpp
+++ b/source/colorcurve.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include "color.h"
 #include "colorcurve.h"
 #include "mesh.h"
 #include "shader.h"
@@ -6,47 +7,14 @@
 
 using namespace std;
 
-namespace {
-
-static const char fragment_src[] =
-       "uniform sampler2D texture;\n"
-       "uniform sampler1D curve;\n"
-       "uniform float peak;\n"
-       "uniform float brightness;\n"
-       "varying vec2 texcoord;\n"
-       "void main()\n"
-       "{\n"
-       "       vec4 sample = texture2D(texture, texcoord);\n"
-       "       float maxc = max(sample.r, max(sample.g, sample.b));\n"
-       "       if(maxc>1.0-peak)\n"
-       "       {\n"
-       "               vec3 saturated = sample.rgb/maxc;\n"
-       "               if(maxc>1.0+peak)\n"
-       "               {\n"
-       "                       sample.rgb = mix(vec3(1.0), saturated, 1.0/pow(brightness, maxc-1.0-peak));\n"
-       "               }\n"
-       "               else\n"
-       "               {\n"
-       "                       float x = (1.0+peak-maxc)/(2.0*peak);\n"
-       "                       sample.rgb = saturated.rgb*(1.0-peak+(1.0-x*x)*peak);\n"
-       "               }\n"
-       "       }\n"
-       "       gl_FragColor = vec4(texture1D(curve, sample.r).r, texture1D(curve, sample.g).r, texture1D(curve, sample.b).r, sample.a);\n"
-       "}";
-
-}
-
 namespace Msp {
 namespace GL {
 
 ColorCurve::ColorCurve():
+       shprog("colorcurve.glsl"),
        quad(get_fullscreen_quad())
 {
-       shprog.attach_shader(get_fullscreen_vertex_shader());
-       shprog.attach_shader_owned(new FragmentShader(fragment_src));
-       shprog.link();
-
-       shdata.uniform("texture", 0);
+       shdata.uniform("source", 0);
        shdata.uniform("curve", 1);
 
        curve.storage(LUMINANCE, 256);
@@ -88,7 +56,7 @@ void ColorCurve::set_srgb()
        unsigned char curve_data[256];
        curve_data[0] = 0;
        for(unsigned i=1; i<256; ++i)
-               curve_data[i] = (1.055*pow(i/255.0f, 1/2.4f)-0.055)*255+0.5;
+               curve_data[i] = to_srgb(i/255.0f)*255+0.5f;
        curve.image(0, LUMINANCE, UNSIGNED_BYTE, curve_data);
 }
 
@@ -104,6 +72,7 @@ void ColorCurve::render(const Texture2D &color_buf, const Texture2D &)
 {
        Bind _bind_shader(shprog);
        shdata.apply();
+       Bind _bind_mesh(quad);
        Bind _bind_tex(color_buf);
        Bind _bind_curve(curve, 1);
        quad.draw();