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) {
// 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) {
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);
}
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());
output_node->output_texture_width = phases[i]->output_width;
output_node->output_texture_height = phases[i]->output_height;
}
+ inform_input_sizes(phases.back());
}
for (unsigned i = 0; i < inputs.size(); ++i) {
for (unsigned phase = 0; phase < phases.size(); ++phase) {
// See if the requested output size has changed. If so, we need to recreate
// the texture (and before we start setting up inputs).
+ inform_input_sizes(phases[phase]);
if (phase != phases.size() - 1) {
- inform_input_sizes(phases[phase]);
find_output_size(phases[phase]);
Node *output_node = phases[phase]->effects.back();