Fix some small whitespace errors in SingleResamplePassEffect.

[movit] / resample_effect.h

diff --git a/resample_effect.h b/resample_effect.h
index 5906a3c44ca41f499b17340e3fcc36fdaec80dfc..027a497cc5fb5d6616ad43190117e4f91ed025d9 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -46,29 +46,46 @@ struct ScalingWeights {
 };
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
 
+// A simple manager for support data stored in a 2D texture.
+// Consider moving it to a shared location of more classes
+// should need similar functionality.
+class Support2DTexture {
+public:
+       Support2DTexture();
+       ~Support2DTexture();
+
+       void update(GLint width, GLint height, GLenum internal_format, GLenum format, GLenum type, const GLvoid * data);
+       GLint get_texnum() const { return texnum; }
+
+private:
+       GLuint texnum = 0;
+       GLint last_texture_width = -1, last_texture_height = -1;
+       GLenum last_texture_internal_format = GL_INVALID_ENUM;
+};
+
 class ResampleEffect : public Effect {
 public:
        ResampleEffect();
        ~ResampleEffect();
 
-       virtual std::string effect_type_id() const { return "ResampleEffect"; }
+       std::string effect_type_id() const override { return "ResampleEffect"; }
 
        // We want this for the same reason as ResizeEffect; we could end up scaling
        // down quite a lot.
-       virtual bool needs_texture_bounce() const { return true; }
-       virtual bool needs_srgb_primaries() const { return false; }
+       bool needs_texture_bounce() const override { return true; }
+       bool needs_srgb_primaries() const override { return false; }
 
-       virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
+       void inform_input_size(unsigned input_num, unsigned width, unsigned height) override;
 
-       virtual std::string output_fragment_shader() {
+       std::string output_fragment_shader() override {
                assert(false);
        }
-       virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) {
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override {
                assert(false);
        }
 
-       virtual void rewrite_graph(EffectChain *graph, Node *self);
-       virtual bool set_float(const std::string &key, float value);
+       void rewrite_graph(EffectChain *graph, Node *self) override;
+       bool set_float(const std::string &key, float value) override;
        
 private:
        void update_size();
@@ -76,8 +93,8 @@ private:
        
        // Both of these are owned by us if owns_effects is true (before finalize()),
        // and otherwise owned by the EffectChain.
-       bool owns_effects;
-       SingleResamplePassEffect *hpass, *vpass;
+       std::unique_ptr<SingleResamplePassEffect> hpass_owner, vpass_owner;
+       SingleResamplePassEffect *hpass = nullptr, *vpass = nullptr;
        int input_width, input_height, output_width, output_height;
 
        float offset_x, offset_y;
@@ -92,29 +109,29 @@ public:
        // resolutions.
        SingleResamplePassEffect(ResampleEffect *parent);
        ~SingleResamplePassEffect();
-       virtual std::string effect_type_id() const { return "SingleResamplePassEffect"; }
+       std::string effect_type_id() const override { return "SingleResamplePassEffect"; }
 
-       std::string output_fragment_shader();
+       std::string output_fragment_shader() override;
 
-       virtual bool needs_texture_bounce() const { return true; }
-       virtual bool needs_srgb_primaries() const { return false; }
-       virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
+       bool needs_texture_bounce() const override { return true; }
+       bool needs_srgb_primaries() const override { return false; }
+       AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
-       virtual void inform_added(EffectChain *chain) { this->chain = chain; }
-       virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
+       void inform_added(EffectChain *chain) override { this->chain = chain; }
+       void inform_input_size(unsigned input_num, unsigned width, unsigned height) override {
                if (parent != nullptr) {
                        parent->inform_input_size(input_num, width, height);
                }
        }
-       virtual bool changes_output_size() const { return true; }
-       virtual bool sets_virtual_output_size() const { return false; }
+       bool changes_output_size() const override { return true; }
+       bool sets_virtual_output_size() const override { return false; }
 
-       virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
+       void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const override {
                *virtual_width = *width = this->output_width;
                *virtual_height = *height = this->output_height;
        }
 
-       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+       void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override;
        
        enum Direction { HORIZONTAL = 0, VERTICAL = 1 };
 
@@ -124,7 +141,6 @@ private:
        ResampleEffect *parent;
        EffectChain *chain;
        Direction direction;
-       GLuint texnum;
        GLint uniform_sample_tex;
        float uniform_num_loops, uniform_slice_height, uniform_sample_x_scale, uniform_sample_x_offset;
        float uniform_whole_pixel_offset;
@@ -136,8 +152,7 @@ private:
        float last_offset, last_zoom;
        int src_bilinear_samples, num_loops;
        float slice_height;
-       int last_texture_width, last_texture_height;
-       GLuint last_texture_internal_format;
+       Support2DTexture tex;
 };
 
 }  // namespace movit