X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=56d470fb572e7764e0c78d02bf8d8a0e0a08f506;hp=50fe599280f0c95350f67d059b5c845b6042bda6;hb=f6c44598c9dad9ddd024c5f8f010d179a6d971fd;hpb=8f070dcdd579e19e092a6619115f4b084fbb2c33;ds=sidebyside

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 50fe599..56d470f 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -10,8 +10,10 @@
 #include "util.h"
 #include "effect_chain.h"
 #include "gamma_expansion_effect.h"
+#include "gamma_compression_effect.h"
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
+#include "texture_enum.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
 	: width(width), height(height), finalized(false) {}
@@ -41,24 +43,34 @@ Effect *instantiate_effect(EffectId effect)
 	assert(false);
 }
 
+void EffectChain::normalize_to_linear_gamma()
+{
+	GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
+	gamma_conversion->set_int("source_curve", current_gamma_curve);
+	effects.push_back(gamma_conversion);
+	current_gamma_curve = GAMMA_LINEAR;
+}
+
+void EffectChain::normalize_to_srgb()
+{
+	assert(current_gamma_curve == GAMMA_LINEAR);
+	ColorSpaceConversionEffect *colorspace_conversion = new ColorSpaceConversionEffect();
+	colorspace_conversion->set_int("source_space", current_color_space);
+	colorspace_conversion->set_int("destination_space", COLORSPACE_sRGB);
+	effects.push_back(colorspace_conversion);
+	current_color_space = COLORSPACE_sRGB;
+}
+
 Effect *EffectChain::add_effect(EffectId effect_id)
 {
 	Effect *effect = instantiate_effect(effect_id);
 
 	if (effect->needs_linear_light() && current_gamma_curve != GAMMA_LINEAR) {
-		GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
-		gamma_conversion->set_int("source_curve", current_gamma_curve);
-		effects.push_back(gamma_conversion);
-		current_gamma_curve = GAMMA_LINEAR;
+		normalize_to_linear_gamma();
 	}
 
 	if (effect->needs_srgb_primaries() && current_color_space != COLORSPACE_sRGB) {
-		assert(current_gamma_curve == GAMMA_LINEAR);
-		ColorSpaceConversionEffect *colorspace_conversion = new ColorSpaceConversionEffect();
-		colorspace_conversion->set_int("source_space", current_color_space);
-		colorspace_conversion->set_int("destination_space", COLORSPACE_sRGB);
-		effects.push_back(colorspace_conversion);
-		current_color_space = COLORSPACE_sRGB;
+		normalize_to_srgb();
 	}
 
 	// not handled yet
@@ -112,6 +124,19 @@ std::string replace_prefix(const std::string &text, const std::string &prefix)
 
 void EffectChain::finalize()
 {
+	// TODO: If we want a non-sRGB output color space, convert.
+
+	if (current_gamma_curve != output_format.gamma_curve) {
+		if (current_gamma_curve != GAMMA_LINEAR) {
+			normalize_to_linear_gamma();
+		}
+		assert(current_gamma_curve == GAMMA_LINEAR);
+		GammaCompressionEffect *gamma_conversion = new GammaCompressionEffect();
+		gamma_conversion->set_int("destination_curve", output_format.gamma_curve);
+		effects.push_back(gamma_conversion);
+		current_gamma_curve = output_format.gamma_curve;
+	}
+
 	std::string frag_shader = read_file("header.glsl");
 
 	for (unsigned i = 0; i < effects.size(); ++i) {
@@ -124,18 +149,80 @@ void EffectChain::finalize()
 		frag_shader += replace_prefix(effects[i]->output_glsl(), effect_id);
 		frag_shader += "#undef PREFIX\n";
 		frag_shader += "#undef FUNCNAME\n";
+		frag_shader += "#undef LAST_INPUT\n";
 		frag_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
 		frag_shader += "\n";
 	}
+	frag_shader.append(read_file("footer.glsl"));
 	printf("%s\n", frag_shader.c_str());
 	
 	glsl_program_num = glCreateProgram();
 	GLhandleARB vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
 	GLhandleARB fs_obj = compile_shader(frag_shader, GL_FRAGMENT_SHADER);
-	glAttachObjectARB(glsl_program_num, vs_obj);
+	glAttachShader(glsl_program_num, vs_obj);
 	check_error();
-	glAttachObjectARB(glsl_program_num, fs_obj);
+	glAttachShader(glsl_program_num, fs_obj);
 	check_error();
 	glLinkProgram(glsl_program_num);
 	check_error();
+
+	finalized = true;
+}
+
+void EffectChain::render_to_screen(unsigned char *src)
+{
+	assert(finalized);
+
+	check_error();
+	glUseProgram(glsl_program_num);
+	check_error();
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
+
+	// TODO: use sRGB textures if applicable
+	if (input_format.pixel_format == FORMAT_RGB) {
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, src);
+	} else if (input_format.pixel_format == FORMAT_RGBA) {
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, src);
+	} else {
+		assert(false);
+	}
+	check_error();
+	glUniform1i(glGetUniformLocation(glsl_program_num, "input_tex"), 0);
+
+	//for (unsigned i = 0; i < effects.size(); ++i) {
+	//	effects[i]->set_uniforms();
+	//}
+
+	glDisable(GL_BLEND);
+	check_error();
+	glDisable(GL_DEPTH_TEST);
+	check_error();
+	glDepthMask(GL_FALSE);
+	check_error();
+
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glOrtho(0.0, 1.0, 0.0, 1.0, 0.0, 1.0);
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glBegin(GL_QUADS);
+
+	glTexCoord2f(0.0f, 1.0f);
+	glVertex2f(0.0f, 0.0f);
+
+	glTexCoord2f(1.0f, 1.0f);
+	glVertex2f(1.0f, 0.0f);
+
+	glTexCoord2f(1.0f, 0.0f);
+	glVertex2f(1.0f, 1.0f);
+
+	glTexCoord2f(0.0f, 0.0f);
+	glVertex2f(0.0f, 1.0f);
+
+	glEnd();
+	check_error();
 }