X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=d509fba391029866cb36c3288f2969c8c5b4baab;hp=4e43eed269b96c315286249b08f7fbcf4a58d01e;hb=abb7221a797bb5332f9ff9346396beb4c95dcc34;hpb=c36321a4c199c24a98cf3acef49e986ea65ae3f1 diff --git a/effect_chain.cpp b/effect_chain.cpp index 4e43eed..d509fba 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 *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) { @@ -241,7 +242,18 @@ Phase *EffectChain::compile_glsl_program( } frag_shader += std::string("#define INPUT ") + effects.back()->effect_id + "\n"; frag_shader.append(read_file("footer.frag")); - printf("%s\n", frag_shader.c_str()); + + // Output shader to a temporary file, for easier debugging. + static int compiled_shader_num = 0; + char filename[256]; + sprintf(filename, "chain-%03d.frag", compiled_shader_num++); + FILE *fp = fopen(filename, "w"); + if (fp == NULL) { + perror(filename); + exit(1); + } + fprintf(fp, "%s\n", frag_shader.c_str()); + fclose(fp); GLuint glsl_program_num = glCreateProgram(); GLuint vs_obj = compile_shader(read_file("vs.vert"), GL_VERTEX_SHADER); @@ -318,13 +330,27 @@ void EffectChain::construct_glsl_programs(Node *output) start_new_phase = true; } - if (deps[i]->outgoing_links.size() > 1 && deps[i]->effect->num_inputs() > 0) { - // More than one effect uses this as the input, - // and it is not a texture itself. - // The easiest thing to do (and probably also the safest - // performance-wise in most cases) is to bounce it to a texture - // and then let the next passes read from that. - start_new_phase = true; + if (deps[i]->outgoing_links.size() > 1) { + if (deps[i]->effect->num_inputs() > 0) { + // More than one effect uses this as the input, + // and it is not a texture itself. + // The easiest thing to do (and probably also the safest + // performance-wise in most cases) is to bounce it to a texture + // and then let the next passes read from that. + start_new_phase = true; + } else { + // For textures, we try to be slightly more clever; + // if none of our outputs need a bounce, we don't bounce + // but instead simply use the effect many times. + // + // Strictly speaking, we could bounce it for some outputs + // and use it directly for others, but the processing becomes + // somewhat simpler if the effect is only used in one such way. + for (unsigned j = 0; j < deps[i]->outgoing_links.size(); ++j) { + Node *rdep = deps[i]->outgoing_links[j]; + start_new_phase |= rdep->effect->needs_texture_bounce(); + } + } } if (deps[i]->effect->changes_output_size()) { @@ -382,7 +408,23 @@ void EffectChain::output_dot(const char *filename) fprintf(fp, "digraph G {\n"); for (unsigned i = 0; i < nodes.size(); ++i) { - fprintf(fp, " n%ld [label=\"%s\"];\n", (long)nodes[i], nodes[i]->effect->effect_type_id().c_str()); + // Find out which phase this event belongs to. + int in_phase = -1; + for (unsigned j = 0; j < phases.size(); ++j) { + const Phase* p = phases[j]; + if (std::find(p->effects.begin(), p->effects.end(), nodes[i]) != p->effects.end()) { + assert(in_phase == -1); + in_phase = j; + } + } + + if (in_phase == -1) { + fprintf(fp, " n%ld [label=\"%s\"];\n", (long)nodes[i], nodes[i]->effect->effect_type_id().c_str()); + } else { + fprintf(fp, " n%ld [label=\"%s\" style=\"filled\" fillcolor=\"/accent8/%d\"];\n", + (long)nodes[i], nodes[i]->effect->effect_type_id().c_str(), + (in_phase % 8) + 1); + } for (unsigned j = 0; j < nodes[i]->outgoing_links.size(); ++j) { std::vector labels; @@ -706,6 +748,22 @@ bool EffectChain::node_needs_gamma_fix(Node *node) if (node->disabled) { return false; } + + // Small hack since the output is not an explicit node: + // If we are the last node and our output is in the wrong + // space compared to EffectChain's output, we need to fix it. + // This will only take us to linear, but fix_output_gamma() + // will come and take us to the desired output gamma + // if it is needed. + // + // This needs to be before everything else, since it could + // even apply to inputs (if they are the only effect). + if (node->outgoing_links.empty() && + node->output_gamma_curve != output_format.gamma_curve && + node->output_gamma_curve != GAMMA_LINEAR) { + return true; + } + if (node->effect->num_inputs() == 0) { return false; } @@ -720,6 +778,7 @@ bool EffectChain::node_needs_gamma_fix(Node *node) assert(node->incoming_links.size() == 1); return node->incoming_links[0]->output_gamma_curve != GAMMA_LINEAR; } + return (node->effect->needs_linear_light() && node->output_gamma_curve != GAMMA_LINEAR); } @@ -744,6 +803,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 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) { @@ -786,8 +846,21 @@ void EffectChain::fix_internal_gamma_by_inserting_nodes(unsigned step) continue; } - // Go through each input that is not linear gamma, and insert - // a gamma conversion before it. + // Special case: We could be an input and still be asked to + // fix our gamma; if so, we should be the only node + // (as node_needs_gamma_fix() would only return true in + // for an input in that case). That means we should insert + // a conversion node _after_ ourselves. + if (node->incoming_links.empty()) { + assert(node->outgoing_links.empty()); + Node *conversion = add_node(new GammaExpansionEffect()); + conversion->effect->set_int("source_curve", node->output_gamma_curve); + conversion->output_gamma_curve = GAMMA_LINEAR; + connect_nodes(node, conversion); + } + + // If not, go through each input that is not linear gamma, + // and insert a gamma conversion before it. for (unsigned j = 0; j < node->incoming_links.size(); ++j) { Node *input = node->incoming_links[j]; assert(input->output_gamma_curve != GAMMA_INVALID); @@ -795,7 +868,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,15 +955,17 @@ 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()); + output_dot("step11-split-to-phases.dot"); + // If we have more than one phase, we need intermediate render-to-texture. // Construct an FBO, and then as many textures as we need. // We choose the simplest option of having one texture per output, @@ -930,13 +1005,21 @@ void EffectChain::finalize() finalized = true; } -void EffectChain::render_to_screen() +void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height) { assert(finalized); // Save original viewport. - GLint viewport[4]; - glGetIntegerv(GL_VIEWPORT, viewport); + GLuint x = 0, y = 0; + + if (width == 0 && height == 0) { + GLint viewport[4]; + glGetIntegerv(GL_VIEWPORT, viewport); + x = viewport[0]; + y = viewport[1]; + width = viewport[2]; + height = viewport[3]; + } // Basic state. glDisable(GL_BLEND); @@ -1014,10 +1097,10 @@ void EffectChain::render_to_screen() // And now the output. if (phase == phases.size() - 1) { - // Last phase goes directly to the screen. - glBindFramebuffer(GL_FRAMEBUFFER, 0); + // Last phase goes to the output the user specified. + glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo); check_error(); - glViewport(viewport[0], viewport[1], viewport[2], viewport[3]); + glViewport(x, y, width, height); } else { Node *output_node = phases[phase]->effects.back(); glFramebufferTexture2D(