Cleanup: Make uniforms for RTT samplers like all other uniforms.

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index ee4c7ba94542a20795e2c9660f0debf860a36f7e..1be98916d9ccd6952580aef165488c55cecc7588 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -109,6 +109,10 @@ struct Phase {
        // Inputs are only inputs from other phases (ie., those that come from RTT);
        // input textures are counted as part of <effects>.
        std::vector<Phase *> 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<int> input_samplers;
        std::vector<Node *> effects;  // In order.
        unsigned output_width, output_height, virtual_output_width, virtual_output_height;
 
@@ -117,6 +121,7 @@ struct Phase {
        std::map<Node *, std::string> effect_ids;
 
        // Uniforms for this phase; combined from all the effects.
+       std::vector<Uniform<int> > uniforms_sampler2d;
        std::vector<Uniform<bool> > uniforms_bool;
        std::vector<Uniform<int> > uniforms_int;
        std::vector<Uniform<float> > uniforms_float;
@@ -279,9 +284,8 @@ private:
        // 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,
-       // and bind it to "tex_" plus the given GLSL variable.
-       void setup_rtt_sampler(GLuint glsl_program_num, int sampler_num, const std::string &effect_id, bool use_mipmaps);
+       // 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.