X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Feffects%2Fcolorcurve.cpp;h=697a0583de0c43df6fc37f7408823c4ec74f3388;hp=7b8c63b053ffe48681e09a2aa2f7293e3073df75;hb=1863f17c5c5563be8492d7f01e5c613a740ea1e9;hpb=dccad64b2ec82249d850b9745614042171499972

diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp
index 7b8c63b0..697a0583 100644
--- a/source/effects/colorcurve.cpp
+++ b/source/effects/colorcurve.cpp
@@ -12,17 +12,13 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ColorCurve::ColorCurve(Resources &resources):
-	shprog(resources.get<Program>("_colorcurve.glsl.shader")),
-	quad(resources.get<Mesh>("_fullscreen_quad.mesh")),
-	linear_sampler(resources.get<Sampler>("_linear_clamp.samp")),
-	nearest_sampler(resources.get<Sampler>("_nearest_clamp.samp"))
+ColorCurve::ColorCurve():
+	shprog(Resources::get_global().get<Program>("_colorcurve.glsl.shader")),
+	quad(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
+	linear_sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
+	nearest_sampler(Resources::get_global().get<Sampler>("_nearest_clamp.samp"))
 {
-	shdata.uniform("source", 0);
-	shdata.uniform("curve", 1);
-
 	curve.storage(LUMINANCE8, 256, 1);
-	texturing.attach(1, curve, &linear_sampler);
 
 	set_exposure_adjust(0.0f);
 	set_brightness_response(0.4f);
@@ -38,6 +34,7 @@ void ColorCurve::set_brightness_response(float b)
 {
 	if(b<=0 || b>1)
 		throw invalid_argument("ColorCurve::set_brightness_response");
+	// Calculate an offset value to obtain a derivative of 1 at zero intensity.
 	float t = (b<1 ? pow(b, 1/(1-b)) : 0.0f);
 	shdata.uniform("brightness_response", b, t, pow(t, b));
 }
@@ -72,14 +69,23 @@ void ColorCurve::set_linear()
 
 void ColorCurve::render(Renderer &renderer, const Texture2D &color_buf, const Texture2D &)
 {
-	texturing.attach(0, color_buf, &nearest_sampler);
-
 	Renderer::Push push(renderer);
 	renderer.set_shader_program(&shprog, &shdata);
-	renderer.set_texturing(&texturing);
+	renderer.set_texture("source", &color_buf, &nearest_sampler);
+	renderer.set_texture("curve", &curve, &linear_sampler);
 	quad.draw(renderer);
 }
 
+void ColorCurve::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	shdata.set_debug_name(name+" [UBO]");
+	curve.set_debug_name(name+"/curve.tex1d");
+#else
+	(void)name;
+#endif
+}
+
 
 ColorCurve::Template::Template():
 	exposure_adjust(0.0f),
@@ -88,9 +94,9 @@ ColorCurve::Template::Template():
 	srgb(false)
 { }
 
-ColorCurve *ColorCurve::Template::create(Resources &res, unsigned, unsigned) const
+ColorCurve *ColorCurve::Template::create(unsigned, unsigned) const
 {
-	RefPtr<ColorCurve> colorcurve = new ColorCurve(res);
+	RefPtr<ColorCurve> colorcurve = new ColorCurve();
 	colorcurve->set_exposure_adjust(exposure_adjust);
 	colorcurve->set_brightness_response(brightness_response);
 	if(srgb)