X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=7b0861f903e9beaf695057e795b165577f35041e;hp=19d89f823c313b6faca3bcdd3c1aef505f762f8d;hb=3a918307fb46478ea8080222a58406cfe04a7cbe;hpb=88003f99c7ef12ed895e504d41c6d528c3fda78d diff --git a/effect_chain.cpp b/effect_chain.cpp index 19d89f8..7b0861f 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -38,6 +38,9 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *res output_color_rgba(false), output_color_ycbcr(false), dither_effect(NULL), + ycbcr_conversion_effect_node(NULL), + intermediate_format(GL_RGBA16F), + intermediate_transformation(NO_FRAMEBUFFER_TRANSFORMATION), num_dither_bits(0), output_origin(OUTPUT_ORIGIN_BOTTOM_LEFT), finalized(false), @@ -108,6 +111,23 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat assert(ycbcr_format.chroma_subsampling_y == 1); } +void EffectChain::change_ycbcr_output_format(const YCbCrFormat &ycbcr_format) +{ + assert(output_color_ycbcr); + assert(output_ycbcr_format.chroma_subsampling_x == ycbcr_format.chroma_subsampling_x); + assert(output_ycbcr_format.chroma_subsampling_y == ycbcr_format.chroma_subsampling_y); + assert(fabs(output_ycbcr_format.cb_x_position - ycbcr_format.cb_x_position) < 1e-3); + assert(fabs(output_ycbcr_format.cb_y_position - ycbcr_format.cb_y_position) < 1e-3); + assert(fabs(output_ycbcr_format.cr_x_position - ycbcr_format.cr_x_position) < 1e-3); + assert(fabs(output_ycbcr_format.cr_y_position - ycbcr_format.cr_y_position) < 1e-3); + + output_ycbcr_format = ycbcr_format; + if (finalized) { + YCbCrConversionEffect *effect = (YCbCrConversionEffect *)(ycbcr_conversion_effect_node->effect); + effect->change_output_format(ycbcr_format); + } +} + Node *EffectChain::add_node(Effect *effect) { for (unsigned i = 0; i < nodes.size(); ++i) { @@ -331,7 +351,14 @@ void EffectChain::compile_glsl_program(Phase *phase) frag_shader += string("uniform sampler2D tex_") + effect_id + ";\n"; frag_shader += string("vec4 ") + effect_id + "(vec2 tc) {\n"; - frag_shader += "\treturn tex2D(tex_" + string(effect_id) + ", tc);\n"; + frag_shader += "\tvec4 tmp = tex2D(tex_" + string(effect_id) + ", tc);\n"; + + if (intermediate_transformation == SQUARE_ROOT_FRAMEBUFFER_TRANSFORMATION && + phase->inputs[i]->output_node->output_gamma_curve == GAMMA_LINEAR) { + frag_shader += "\ttmp.rgb *= tmp.rgb;\n"; + } + + frag_shader += "\treturn tmp;\n"; frag_shader += "}\n"; frag_shader += "\n"; @@ -414,6 +441,15 @@ void EffectChain::compile_glsl_program(Phase *phase) frag_shader_outputs.push_back("RGBA"); } } + + // If we're bouncing to a temporary texture, signal transformation if desired. + if (!phase->output_node->outgoing_links.empty()) { + if (intermediate_transformation == SQUARE_ROOT_FRAMEBUFFER_TRANSFORMATION && + phase->output_node->output_gamma_curve == GAMMA_LINEAR) { + frag_shader += "#define SQUARE_ROOT_TRANSFORMATION 1\n"; + } + } + frag_shader.append(read_file("footer.frag")); // Collect uniforms from all effects and output them. Note that this needs @@ -1175,6 +1211,11 @@ void EffectChain::propagate_alpha() if (alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA || alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK) { + // This combination (requiring premultiplied alpha, but _not_ requiring + // linear light) is illegal, since the combination of premultiplied alpha + // and nonlinear inputs is meaningless. + assert(node->effect->needs_linear_light()); + // If the effect has asked for premultiplied alpha, check that it has got it. if (any_postmultiplied) { node->output_alpha_type = ALPHA_INVALID; @@ -1576,8 +1617,8 @@ void EffectChain::add_ycbcr_conversion_if_needed() return; } Node *output = find_output_node(); - Node *ycbcr = add_node(new YCbCrConversionEffect(output_ycbcr_format)); - connect_nodes(output, ycbcr); + ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format)); + connect_nodes(output, ycbcr_conversion_effect_node); } // If the user has requested dither, add a DitherEffect right at the end @@ -1693,6 +1734,10 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height glDisable(GL_DITHER); check_error(); + const bool final_srgb = glIsEnabled(GL_FRAMEBUFFER_SRGB); + check_error(); + bool current_srgb = final_srgb; + // Save original viewport. GLuint x = 0, y = 0; @@ -1757,7 +1802,22 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height CHECK(dither_effect->set_int("output_height", height)); } } - execute_phase(phase, phase_num == phases.size() - 1, &bound_attribute_indices, &output_textures, &generated_mipmaps); + bool last_phase = (phase_num == phases.size() - 1); + + // Enable sRGB rendering for intermediates in case we are + // rendering to an sRGB format. + bool needs_srgb = last_phase ? final_srgb : true; + if (needs_srgb && !current_srgb) { + glEnable(GL_FRAMEBUFFER_SRGB); + check_error(); + current_srgb = true; + } else if (!needs_srgb && current_srgb) { + glDisable(GL_FRAMEBUFFER_SRGB); + check_error(); + current_srgb = true; + } + + execute_phase(phase, last_phase, &bound_attribute_indices, &output_textures, &generated_mipmaps); if (do_phase_timing) { glEndQuery(GL_TIME_ELAPSED); } @@ -1853,13 +1913,10 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, if (!last_phase) { find_output_size(phase); - GLuint tex_num = resource_pool->create_2d_texture(GL_RGBA16F, phase->output_width, phase->output_height); + GLuint tex_num = resource_pool->create_2d_texture(intermediate_format, phase->output_width, phase->output_height); output_textures->insert(make_pair(phase, tex_num)); } - glUseProgram(phase->glsl_program_num); - check_error(); - // Set up RTT inputs for this phase. for (unsigned sampler = 0; sampler < phase->inputs.size(); ++sampler) { glActiveTexture(GL_TEXTURE0 + sampler); @@ -1883,12 +1940,15 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, glViewport(0, 0, phase->output_width, phase->output_height); } + GLuint instance_program_num = resource_pool->use_glsl_program(phase->glsl_program_num); + check_error(); + // Give the required parameters to all the effects. unsigned sampler_num = phase->inputs.size(); for (unsigned i = 0; i < phase->effects.size(); ++i) { Node *node = phase->effects[i]; unsigned old_sampler_num = sampler_num; - node->effect->set_gl_state(phase->glsl_program_num, phase->effect_ids[node], &sampler_num); + node->effect->set_gl_state(instance_program_num, phase->effect_ids[node], &sampler_num); check_error(); if (node->effect->is_single_texture()) { @@ -1936,6 +1996,8 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, node->effect->clear_gl_state(); } + resource_pool->unuse_glsl_program(instance_program_num); + if (!last_phase) { resource_pool->release_fbo(fbo); }