Another benchmarking data set fix.

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index ee387a954613edc8629b49762d720e339479d9ab..a36840d314876e88185ef1f69bf32b537c465f24 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -153,6 +153,9 @@ private:
        // (in the same phase) have one_to_one_sampling() set.
        bool one_to_one_sampling;
 
+       // Same, for strong_one_to_one_sampling().
+       bool strong_one_to_one_sampling;
+
        friend class EffectChain;
 };
 
@@ -181,6 +184,7 @@ struct Phase {
        // Whether this phase is compiled as a compute shader, ie., the last effect is
        // marked as one.
        bool is_compute_shader;
+       Node *compute_shader_node;
 
        // If <is_compute_shader>, which image unit the output buffer is bound to.
        // This is used as source for a Uniform<int> below.
@@ -188,6 +192,7 @@ struct Phase {
 
        // These are used in transforming from unnormalized to normalized coordinates
        // in compute shaders.
+       int uniform_output_size[2];
        Point2D inv_output_size, output_texcoord_adjust;
 
        // Identifier used to create unique variables in GLSL.
@@ -199,6 +204,7 @@ struct Phase {
        std::vector<Uniform<int>> uniforms_sampler2d;
        std::vector<Uniform<bool>> uniforms_bool;
        std::vector<Uniform<int>> uniforms_int;
+       std::vector<Uniform<int>> uniforms_ivec2;
        std::vector<Uniform<float>> uniforms_float;
        std::vector<Uniform<float>> uniforms_vec2;
        std::vector<Uniform<float>> uniforms_vec3;
@@ -394,10 +400,15 @@ public:
        // except that it is more efficient if the last phase contains a compute shader.
        // Thus, prefer this to render_to_fbo() where possible.
        //
-       // The format must currently be GL_RGBA16F, and only one destination
-       // texture is supported. Both of these restrictions will be lifted in the future.
+       // Only one destination texture is supported. This restriction will be lifted
+       // in the future.
+       //
+       // All destination textures must be exactly of size <width> x <height>,
+       // and must either come from the same ResourcePool the effect uses, or outlive
+       // the EffectChain (otherwise, we could be allocating FBOs that end up being
+       // stale). Textures must also have valid state; in particular, they must either
+       // be mipmap complete or have a non-mipmapped minification mode.
        //
-       // All destination textures must be exactly of size <width> x <height>.
        // width and height can not be zero.
        struct DestinationTexture {
                GLuint texnum;
@@ -481,11 +492,11 @@ private:
                    unsigned x, unsigned y, unsigned width, unsigned height);
 
        // Execute one phase, ie. set up all inputs, effects and outputs, and render the quad.
-       // If dest_texture is 0, uses whatever output is current (and the phase must not be
+       // If <destinations> is empty, uses whatever output is current (and the phase must not be
        // a compute shader).
        void execute_phase(Phase *phase,
                           const std::map<Phase *, GLuint> &output_textures,
-                          GLuint dest_texture,
+                          const std::vector<DestinationTexture> &destinations,
                           std::set<Phase *> *generated_mipmaps);
 
        // Set up uniforms for one phase. The program must already be bound.