X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=effect_chain.cpp;h=fcf94f8505299c0ec12156c8ab427b06e9fa73c0;hb=f23c7768e6c13d6a719aaea89074d86b74148aeb;hp=462633c2916526663bebe217af5b4853b4da09bf;hpb=60cc8cf581ceaac4eb7e636e85f9e6161005701d;p=movit

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 462633c..fcf94f8 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:
@@ -205,7 +208,7 @@ void EffectChain::finalize()
 	// and of course at the end.
 	unsigned start = 0;
 	for (unsigned i = 0; i < effects.size(); ++i) {
-		if (effects[i]->needs_many_samples() && i != start) {
+		if (effects[i]->needs_texture_bounce() && i != start) {
 			phases.push_back(compile_glsl_program(start, i));
 			start = i;
 		}
@@ -260,10 +263,7 @@ void EffectChain::finalize()
 	check_error();
 	glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, width * height * bytes_per_pixel, NULL, GL_STREAM_DRAW);
 	check_error();
-
-	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);
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 	check_error();
 	
 	glGenTextures(1, &source_image_num);
@@ -272,9 +272,10 @@ void EffectChain::finalize()
 	check_error();
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
+	// 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);
+	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
 	check_error();
 
 	finalized = true;
@@ -303,11 +304,6 @@ 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();