X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=b8361fef97ec1f79e65ecd71e5ef1896bd11ad7d;hp=4e43eed269b96c315286249b08f7fbcf4a58d01e;hb=bd1d7adce0950493b957309891ae20544a02421c;hpb=c36321a4c199c24a98cf3acef49e986ea65ae3f1

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 4e43eed..b8361fe 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -111,7 +111,8 @@ void EffectChain::insert_node_between(Node *sender, Node *middle, Node *receiver
 
 void EffectChain::find_all_nonlinear_inputs(Node *node, std::vector<Node *> *nonlinear_inputs)
 {
-	if (node->output_gamma_curve == GAMMA_LINEAR) {
+	if (node->output_gamma_curve == GAMMA_LINEAR &&
+	    node->effect->effect_type_id() != "GammaCompressionEffect") {
 		return;
 	}
 	if (node->effect->num_inputs() == 0) {
@@ -744,6 +745,7 @@ void EffectChain::fix_internal_gamma_by_asking_inputs(unsigned step)
 			// See if all inputs can give us linear gamma. If not, leave it.
 			std::vector<Node *> nonlinear_inputs;
 			find_all_nonlinear_inputs(node, &nonlinear_inputs);
+			assert(!nonlinear_inputs.empty());
 
 			bool all_ok = true;
 			for (unsigned i = 0; i < nonlinear_inputs.size(); ++i) {
@@ -795,7 +797,7 @@ void EffectChain::fix_internal_gamma_by_inserting_nodes(unsigned step)
 					continue;
 				}
 				Node *conversion = add_node(new GammaExpansionEffect());
-				conversion->effect->set_int("destination_curve", GAMMA_LINEAR);
+				conversion->effect->set_int("source_curve", input->output_gamma_curve);
 				conversion->output_gamma_curve = GAMMA_LINEAR;
 				insert_node_between(input, conversion, node);
 			}
@@ -882,11 +884,11 @@ void EffectChain::finalize()
 	fix_internal_gamma_by_asking_inputs(5);
 	fix_internal_gamma_by_inserting_nodes(6);
 	fix_output_gamma();
-	output_dot("step8-output-gammafix.dot");
-	fix_internal_gamma_by_asking_inputs(9);
-	fix_internal_gamma_by_inserting_nodes(10);
+	output_dot("step7-output-gammafix.dot");
+	fix_internal_gamma_by_asking_inputs(8);
+	fix_internal_gamma_by_inserting_nodes(9);
 
-	output_dot("step11-final.dot");
+	output_dot("step10-final.dot");
 	
 	// Construct all needed GLSL programs, starting at the output.
 	construct_glsl_programs(find_output_node());