X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=c46e60d20475a70fd3b721fefe3d9f3775f3d792;hp=3d4fc6f8af6eaa0900bbfbf305b2cd4fb6adfbf0;hb=1fb55b14a6c694e082f0261e86f26d4f82948821;hpb=aa1fce6c5356faa368758b15b3ad257c0f7bda0b diff --git a/effect_chain.cpp b/effect_chain.cpp index 3d4fc6f..c46e60d 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -97,7 +97,8 @@ void EffectChain::add_output(const ImageFormat &format, OutputAlphaFormat alpha_ } void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, - const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting) + const YCbCrFormat &ycbcr_format, YCbCrOutputSplitting output_splitting, + GLenum output_type) { assert(!finalized); assert(num_output_color_ycbcr < 2); @@ -109,14 +110,12 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat assert(output_ycbcr_format.luma_coefficients == ycbcr_format.luma_coefficients); assert(output_ycbcr_format.full_range == ycbcr_format.full_range); assert(output_ycbcr_format.num_levels == ycbcr_format.num_levels); - 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); + assert(output_ycbcr_format.chroma_subsampling_x == 1); + assert(output_ycbcr_format.chroma_subsampling_y == 1); + assert(output_ycbcr_type == output_type); } else { output_ycbcr_format = ycbcr_format; + output_ycbcr_type = output_type; } output_ycbcr_splitting[num_output_color_ycbcr++] = output_splitting; @@ -127,12 +126,8 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat void EffectChain::change_ycbcr_output_format(const YCbCrFormat &ycbcr_format) { assert(num_output_color_ycbcr > 0); - 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); + assert(output_ycbcr_format.chroma_subsampling_x == 1); + assert(output_ycbcr_format.chroma_subsampling_y == 1); output_ycbcr_format = ycbcr_format; if (finalized) { @@ -1652,7 +1647,7 @@ void EffectChain::add_ycbcr_conversion_if_needed() return; } Node *output = find_output_node(); - ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format)); + ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format, output_ycbcr_type)); connect_nodes(output, ycbcr_conversion_effect_node); } @@ -1794,17 +1789,6 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height glDepthMask(GL_FALSE); check_error(); - // Generate a VAO that will be used during the entire execution, - // and bind the VBO, since it contains all the data. - GLuint vao; - glGenVertexArrays(1, &vao); - check_error(); - glBindVertexArray(vao); - check_error(); - glBindBuffer(GL_ARRAY_BUFFER, vbo); - check_error(); - set bound_attribute_indices; - set generated_mipmaps; // We choose the simplest option of having one texture per output, @@ -1852,7 +1836,7 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height current_srgb = true; } - execute_phase(phase, last_phase, &bound_attribute_indices, &output_textures, &generated_mipmaps); + execute_phase(phase, last_phase, &output_textures, &generated_mipmaps); if (do_phase_timing) { glEndQuery(GL_TIME_ELAPSED); } @@ -1873,8 +1857,6 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height check_error(); glBindVertexArray(0); check_error(); - glDeleteVertexArrays(1, &vao); - check_error(); if (do_phase_timing) { // Get back the timer queries. @@ -1937,7 +1919,6 @@ void EffectChain::print_phase_timing() } void EffectChain::execute_phase(Phase *phase, bool last_phase, - set *bound_attribute_indices, map *output_textures, set *generated_mipmaps) { @@ -1998,30 +1979,9 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, // from there. setup_uniforms(phase); - // Clean up old attributes if they are no longer needed. - for (set::iterator attr_it = bound_attribute_indices->begin(); - attr_it != bound_attribute_indices->end(); ) { - if (phase->attribute_indexes.count(*attr_it) == 0) { - glDisableVertexAttribArray(*attr_it); - check_error(); - bound_attribute_indices->erase(attr_it++); - } else { - ++attr_it; - } - } - - // Set up the new attributes, if needed. - for (set::iterator attr_it = phase->attribute_indexes.begin(); - attr_it != phase->attribute_indexes.end(); - ++attr_it) { - if (bound_attribute_indices->count(*attr_it) == 0) { - glEnableVertexAttribArray(*attr_it); - check_error(); - glVertexAttribPointer(*attr_it, 2, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(0)); - check_error(); - bound_attribute_indices->insert(*attr_it); - } - } + // Bind the vertex data. + GLuint vao = resource_pool->create_vec2_vao(phase->attribute_indexes, vbo); + glBindVertexArray(vao); glDrawArrays(GL_TRIANGLES, 0, 3); check_error(); @@ -2032,6 +1992,7 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase, } resource_pool->unuse_glsl_program(instance_program_num); + resource_pool->release_vec2_vao(vao); if (!last_phase) { resource_pool->release_fbo(fbo);