X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=c55ee26849617374010b879785b6fcfd5cd55b52;hp=b83e81e78a9146339f1a8293f2cc6d5c08eb93cb;hb=a22465673fce8a9db2cf88bccbee72db0e5b4c5e;hpb=ba19dad35d753c81041f9111fa4fd3bce168b319

diff --git a/effect_chain.cpp b/effect_chain.cpp
index b83e81e..c55ee26 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -13,6 +13,7 @@
 #include "gamma_compression_effect.h"
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
+#include "sandbox_effect.h"
 #include "saturation_effect.h"
 #include "mirror_effect.h"
 #include "vignette_effect.h"
@@ -42,6 +43,8 @@ Effect *instantiate_effect(EffectId effect)
 		return new GammaCompressionEffect();
 	case EFFECT_COLOR_SPACE_CONVERSION:
 		return new ColorSpaceConversionEffect();
+	case EFFECT_SANDBOX:
+		return new SandboxEffect();
 	case EFFECT_LIFT_GAMMA_GAIN:
 		return new LiftGammaGainEffect();
 	case EFFECT_SATURATION:
@@ -64,7 +67,7 @@ void EffectChain::normalize_to_linear_gamma()
 	} else {
 		GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
 		gamma_conversion->set_int("source_curve", current_gamma_curve);
-		effects.push_back(gamma_conversion);
+		gamma_conversion->add_self_to_effect_chain(&effects);
 	}
 	current_gamma_curve = GAMMA_LINEAR;
 }
@@ -75,7 +78,7 @@ void EffectChain::normalize_to_srgb()
 	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);
+	colorspace_conversion->add_self_to_effect_chain(&effects);
 	current_color_space = COLORSPACE_sRGB;
 }
 
@@ -91,7 +94,7 @@ Effect *EffectChain::add_effect(EffectId effect_id)
 		normalize_to_srgb();
 	}
 
-	effects.push_back(effect);
+	effect->add_self_to_effect_chain(&effects);
 	return effect;
 }
 
@@ -220,14 +223,16 @@ void EffectChain::finalize()
 		unsigned num_textures = std::max<int>(phases.size() - 1, 2);
 		glGenTextures(num_textures, temp_textures);
 
-		unsigned char *empty = new unsigned char[width * height * 4];
 		for (unsigned i = 0; i < num_textures; ++i) {
 			glBindTexture(GL_TEXTURE_2D, temp_textures[i]);
 			check_error();
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, empty);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			check_error();
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			check_error();
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 			check_error();
 		}
-		delete[] empty;
 	}
 	
 	// Translate the input format to OpenGL's enums.
@@ -262,6 +267,7 @@ void EffectChain::finalize()
 	void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
 	memset(mapped_pbo, 0, width * height * bytes_per_pixel);
 	glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
+	check_error();
 	
 	glGenTextures(1, &source_image_num);
 	check_error();
@@ -300,6 +306,11 @@ void EffectChain::render_to_screen(unsigned char *src)
 	check_error();
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	check_error();
+
+	// Intel/Mesa seems to have a broken glGenerateMipmap() for non-FBO textures, so do it here.
+	glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, phases[0].input_needs_mipmaps ? GL_TRUE : GL_FALSE);
+	check_error();
+
 	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 	check_error();
 
@@ -325,6 +336,7 @@ void EffectChain::render_to_screen(unsigned char *src)
 
 	for (unsigned phase = 0; phase < phases.size(); ++phase) {
 		// Set up inputs and outputs for this phase.
+		glActiveTexture(GL_TEXTURE0);
 		if (phase == 0) {
 			// First phase reads from the input texture (which is already bound).
 		} else {
@@ -332,9 +344,12 @@ void EffectChain::render_to_screen(unsigned char *src)
 			check_error();
 		}
 		if (phases[phase].input_needs_mipmaps) {
-			glGenerateMipmap(GL_TEXTURE_2D);
-			check_error();
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+			if (phase != 0) {
+				// For phase 0, it's done further up.
+				glGenerateMipmap(GL_TEXTURE_2D);
+				check_error();
+			}
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
 			check_error();
 		} else {
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -352,6 +367,7 @@ void EffectChain::render_to_screen(unsigned char *src)
 				GL_TEXTURE_2D,
 				temp_textures[phase % 2],
 				0);
+			check_error();
 		}
 
 		// We have baked an upside-down transform into the quad coordinates,
@@ -399,5 +415,7 @@ void EffectChain::render_to_screen(unsigned char *src)
 		glActiveTexture(GL_TEXTURE0);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
 		check_error();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 1000);
+		check_error();
 	}
 }