X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=574c44e2a68a0c7dac6e5ff43693a628c7ae61af;hp=c04e34d517833384f90266ac7b80004f71c22f6e;hb=09cf0231a4da74583b9c5ea7a54a2cf6efca3515;hpb=5d4c0425579de66b3e2dd7d0095e890278f8efcf

diff --git a/effect_chain.cpp b/effect_chain.cpp
index c04e34d..574c44e 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -1,27 +1,29 @@
 #define GL_GLEXT_PROTOTYPES 1
 
-#include <stdio.h>
+#include <GL/glew.h>
+#include <assert.h>
+#include <locale.h>
 #include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <locale.h>
-#include <assert.h>
-#include <GL/glew.h>
-
 #include <algorithm>
 #include <set>
 #include <stack>
 #include <vector>
 
-#include "util.h"
-#include "effect_chain.h"
-#include "gamma_expansion_effect.h"
-#include "gamma_compression_effect.h"
-#include "colorspace_conversion_effect.h"
-#include "alpha_multiplication_effect.h"
 #include "alpha_division_effect.h"
+#include "alpha_multiplication_effect.h"
+#include "colorspace_conversion_effect.h"
 #include "dither_effect.h"
-#include "input.h"
+#include "effect.h"
+#include "effect_chain.h"
+#include "gamma_compression_effect.h"
+#include "gamma_expansion_effect.h"
 #include "init.h"
+#include "input.h"
+#include "util.h"
 
 EffectChain::EffectChain(float aspect_nom, float aspect_denom)
 	: aspect_nom(aspect_nom),
@@ -782,6 +784,7 @@ void EffectChain::find_color_spaces_for_inputs()
 			case Effect::OUTPUT_POSTMULTIPLIED_ALPHA:
 				node->output_alpha_type = ALPHA_POSTMULTIPLIED;
 				break;
+			case Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK:
 			case Effect::DONT_CARE_ALPHA_TYPE:
 			default:
 				assert(false);
@@ -894,6 +897,7 @@ void EffectChain::propagate_alpha()
 		// whether to divide away the old alpha or not.
 		Effect::AlphaHandling alpha_handling = node->effect->alpha_handling();
 		assert(alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA ||
+		       alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK ||
 		       alpha_handling == Effect::DONT_CARE_ALPHA_TYPE);
 
 		// If the node has multiple inputs, check that they are all valid and
@@ -933,16 +937,16 @@ void EffectChain::propagate_alpha()
 			continue;
 		}
 
-		if (alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA) {
+		if (alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA ||
+		    alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK) {
 			// If the effect has asked for premultiplied alpha, check that it has got it.
 			if (any_postmultiplied) {
 				node->output_alpha_type = ALPHA_INVALID;
+			} else if (!any_premultiplied &&
+			           alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK) {
+				// Blank input alpha, and the effect preserves blank alpha.
+				node->output_alpha_type = ALPHA_BLANK;
 			} else {
-				// In some rare cases, it might be advantageous to say
-				// that blank input alpha yields blank output alpha.
-				// However, this would cause a more complex Effect interface
-				// an effect would need to guarantee that it doesn't mess with
-				// blank alpha), so this is the simplest.
 				node->output_alpha_type = ALPHA_PREMULTIPLIED;
 			}
 		} else {
@@ -1141,14 +1145,14 @@ void EffectChain::fix_output_alpha()
 		return;
 	}
 	if (output->output_alpha_type == ALPHA_PREMULTIPLIED &&
-	    output_alpha_format == OUTPUT_POSTMULTIPLIED_ALPHA) {
+	    output_alpha_format == OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED) {
 		Node *conversion = add_node(new AlphaDivisionEffect());
 		connect_nodes(output, conversion);
 		propagate_alpha();
 		propagate_gamma_and_color_space();
 	}
 	if (output->output_alpha_type == ALPHA_POSTMULTIPLIED &&
-	    output_alpha_format == OUTPUT_ALPHA_PREMULTIPLIED) {
+	    output_alpha_format == OUTPUT_ALPHA_FORMAT_PREMULTIPLIED) {
 		Node *conversion = add_node(new AlphaMultiplicationEffect());
 		connect_nodes(output, conversion);
 		propagate_alpha();
@@ -1555,6 +1559,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));
@@ -1569,6 +1575,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);
 		}