X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=1be98916d9ccd6952580aef165488c55cecc7588;hp=02906fe0b9885b0263db412a16b3b4d0fd540031;hb=ddbe6136a25fddc14c7b70c9d76857313b8f9957;hpb=b757191bc6d258887445d88cdfe5b18666295660 diff --git a/effect_chain.h b/effect_chain.h index 02906fe..1be9891 100644 --- a/effect_chain.h +++ b/effect_chain.h @@ -16,6 +16,10 @@ // but if so, the threads' contexts need to be set up to share resources, since // the EffectChain holds textures and other OpenGL objects that are tied to the // context. +// +// Memory management (only relevant if you use multiple contexts): +// See corresponding comment in resource_pool.h. This holds even if you don't +// allocate your own ResourcePool, but let EffectChain hold its own. #include #include @@ -23,8 +27,11 @@ #include #include #include +#include +#include "effect.h" #include "image_format.h" +#include "ycbcr.h" namespace movit { @@ -58,6 +65,10 @@ public: std::vector outgoing_links; std::vector incoming_links; + // For unit tests only. Do not use from other code. + // Will contain an arbitrary choice if the node is in multiple phases. + Phase *containing_phase; + private: // Logical size of the output of this effect, ie. the resolution // you would get if you sampled it as a texture. If it is undefined @@ -66,11 +77,6 @@ private: // they will be equal. unsigned output_width, output_height; - // If output goes to RTT, which phase it is in (otherwise unset). - // This is a bit ugly; we should probably fix so that Phase takes other - // phases as inputs, instead of Node. - Phase *phase; - // If the effect has is_single_texture(), or if the output went to RTT // and that texture has been bound to a sampler, the sampler number // will be stored here. @@ -84,25 +90,50 @@ private: Colorspace output_color_space; GammaCurve output_gamma_curve; AlphaType output_alpha_type; + bool needs_mipmaps; // Directly or indirectly. + + // Set if this effect, and all effects consuming output from this node + // (in the same phase) have one_to_one_sampling() set. + bool one_to_one_sampling; friend class EffectChain; }; // A rendering phase; a single GLSL program rendering a single quad. struct Phase { + Node *output_node; + GLuint glsl_program_num; // Owned by the resource_pool. bool input_needs_mipmaps; // Inputs are only inputs from other phases (ie., those that come from RTT); - // input textures are not counted here. - std::vector inputs; - + // input textures are counted as part of . + std::vector inputs; + // Bound sampler numbers for each input. Redundant in a sense + // (it always corresponds to the index), but we need somewhere + // to hold the value for the uniform. + std::vector input_samplers; std::vector effects; // In order. unsigned output_width, output_height, virtual_output_width, virtual_output_height; // Identifier used to create unique variables in GLSL. // Unique per-phase to increase cacheability of compiled shaders. std::map effect_ids; + + // Uniforms for this phase; combined from all the effects. + std::vector > uniforms_sampler2d; + std::vector > uniforms_bool; + std::vector > uniforms_int; + std::vector > uniforms_float; + std::vector > uniforms_vec2; + std::vector > uniforms_vec3; + std::vector > uniforms_vec4; + std::vector > uniforms_mat3; + + // For measurement of GPU time used. + GLuint timer_query_object; + uint64_t time_elapsed_ns; + uint64_t num_measured_iterations; }; class EffectChain { @@ -148,8 +179,15 @@ public: } Effect *add_effect(Effect *effect, const std::vector &inputs); + // Adds an RGB output. Note that you can only have one output. void add_output(const ImageFormat &format, OutputAlphaFormat alpha_format); + // Adds an YCbCr output. Note that you can only have one output. + // Currently, only chunked packed output is supported, and only 4:4:4 + // (so chroma_subsampling_x and chroma_subsampling_y must both be 1). + void add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format, + const YCbCrFormat &ycbcr_format); + // Set number of output bits, to scale the dither. // 8 is the right value for most outputs. // The default, 0, is a special value that means no dither. @@ -160,6 +198,14 @@ public: void finalize(); + // Measure the GPU time used for each actual phase during rendering. + // Note that this is only available if GL_ARB_timer_query + // (or, equivalently, OpenGL 3.3) is available. Also note that measurement + // will incur a performance cost, as we wait for the measurements to + // complete at the end of rendering. + void enable_phase_timing(bool enable); + void reset_phase_timing(); + void print_phase_timing(); //void render(unsigned char *src, unsigned char *dst); void render_to_screen() @@ -224,13 +270,22 @@ private: // output gamma different from GAMMA_LINEAR. void find_all_nonlinear_inputs(Node *effect, std::vector *nonlinear_inputs); - // Create a GLSL program computing the given effects in order. - Phase *compile_glsl_program(const std::vector &inputs, - const std::vector &effects); + // Create a GLSL program computing the effects for this phase in order. + void compile_glsl_program(Phase *phase); // Create all GLSL programs needed to compute the given effect, and all outputs - // that depends on it (whenever possible). - void construct_glsl_programs(Node *output); + // that depend on it (whenever possible). Returns the phase that has + // as the last effect. Also pushes all phases in order onto . + Phase *construct_phase(Node *output, std::map *completed_effects); + + // Execute one phase, ie. set up all inputs, effects and outputs, and render the quad. + void execute_phase(Phase *phase, bool last_phase, std::map *output_textures, std::set *generated_mipmaps); + + // Set up uniforms for one phase. The program must already be bound. + void setup_uniforms(Phase *phase); + + // Set up the given sampler number for sampling from an RTT texture. + void setup_rtt_sampler(int sampler_num, bool use_mipmaps); // Output the current graph to the given file in a Graphviz-compatible format; // only useful for debugging. @@ -274,12 +329,17 @@ private: void fix_internal_gamma_by_asking_inputs(unsigned step); void fix_internal_gamma_by_inserting_nodes(unsigned step); void fix_output_gamma(); + void add_ycbcr_conversion_if_needed(); void add_dither_if_needed(); float aspect_nom, aspect_denom; ImageFormat output_format; OutputAlphaFormat output_alpha_format; + enum OutputColorType { OUTPUT_COLOR_RGB, OUTPUT_COLOR_YCBCR }; + OutputColorType output_color_type; + YCbCrFormat output_ycbcr_format; // If output_color_type == OUTPUT_COLOR_YCBCR. + std::vector nodes; std::map node_map; Effect *dither_effect; @@ -292,6 +352,8 @@ private: ResourcePool *resource_pool; bool owns_resource_pool; + + bool do_phase_timing; }; } // namespace movit