X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=6b7a857242e0572c7be6d66afe6026734ec99c6c;hp=00151977be63823288cd0d1c9497e7b9d2708fdb;hb=1f1da18ac6acec9e16e66441160b3949173f1db3;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 0015197..6b7a857 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -29,7 +29,6 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom)
 	: aspect_nom(aspect_nom),
 	  aspect_denom(aspect_denom),
 	  dither_effect(NULL),
-	  fbo(0),
 	  num_dither_bits(0),
 	  finalized(false) {}
 
@@ -48,13 +47,11 @@ EffectChain::~EffectChain()
 		glDeleteShader(phases[i]->fragment_shader);
 		delete phases[i];
 	}
-	if (fbo != 0) {
-		glDeleteFramebuffers(1, &fbo);
-	}
 }
 
 Input *EffectChain::add_input(Input *input)
 {
+	assert(!finalized);
 	inputs.push_back(input);
 	add_node(input);
 	return input;
@@ -62,12 +59,17 @@ Input *EffectChain::add_input(Input *input)
 
 void EffectChain::add_output(const ImageFormat &format, OutputAlphaFormat alpha_format)
 {
+	assert(!finalized);
 	output_format = format;
 	output_alpha_format = alpha_format;
 }
 
 Node *EffectChain::add_node(Effect *effect)
 {
+	for (unsigned i = 0; i < nodes.size(); ++i) {
+		assert(nodes[i]->effect != effect);
+	}
+
 	char effect_id[256];
 	sprintf(effect_id, "eff%u", (unsigned)nodes.size());
 
@@ -157,6 +159,7 @@ void EffectChain::find_all_nonlinear_inputs(Node *node, std::vector<Node *> *non
 
 Effect *EffectChain::add_effect(Effect *effect, const std::vector<Effect *> &inputs)
 {
+	assert(!finalized);
 	assert(inputs.size() == effect->num_inputs());
 	Node *node = add_node(effect);
 	for (unsigned i = 0; i < inputs.size(); ++i) {
@@ -1430,8 +1433,6 @@ void EffectChain::finalize()
 	// since otherwise this turns into an (albeit simple)
 	// register allocation problem.
 	if (phases.size() > 1) {
-		glGenFramebuffers(1, &fbo);
-
 		for (unsigned i = 0; i < phases.size() - 1; ++i) {
 			inform_input_sizes(phases[i]);
 			find_output_size(phases[i]);
@@ -1470,6 +1471,7 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 
 	// Save original viewport.
 	GLuint x = 0, y = 0;
+	GLuint fbo = 0;
 
 	if (width == 0 && height == 0) {
 		GLint viewport[4];
@@ -1496,6 +1498,8 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 	glLoadIdentity();
 
 	if (phases.size() > 1) {
+		glGenFramebuffers(1, &fbo);
+		check_error();
 		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 		check_error();
 	}
@@ -1559,6 +1563,8 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 			// Last phase goes to the output the user specified.
 			glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo);
 			check_error();
+			GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+			assert(status == GL_FRAMEBUFFER_COMPLETE);
 			glViewport(x, y, width, height);
 			if (dither_effect != NULL) {
 				CHECK(dither_effect->set_int("output_width", width));
@@ -1573,6 +1579,8 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 				output_node->output_texture,
 				0);
 			check_error();
+			GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+			assert(status == GL_FRAMEBUFFER_COMPLETE);
 			glViewport(0, 0, phases[phase]->output_width, phases[phase]->output_height);
 		}
 
@@ -1607,4 +1615,12 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 			node->effect->clear_gl_state();
 		}
 	}
+
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	check_error();
+
+	if (fbo != 0) {
+		glDeleteFramebuffers(1, &fbo);
+		check_error();
+	}
 }