Move the functionality for updating the support texture using glTexImage2D or glTexSu...

diff --git a/resample_effect.cpp b/resample_effect.cpp
index 1722356b72ac0f02adcacb006bf27fbab5aa4088..ffc64fb7f76a2828c3d182f7cdd8cf73c11cd186 100644 (file)
--- a/resample_effect.cpp
+++ b/resample_effect.cpp
@@ -448,8 +448,7 @@ SingleResamplePassEffect::SingleResamplePassEffect(ResampleEffect *parent)
          last_output_width(-1),
          last_output_height(-1),
          last_offset(0.0 / 0.0),  // NaN.
          last_output_width(-1),
          last_output_height(-1),
          last_offset(0.0 / 0.0),  // NaN.

-         last_zoom(0.0 / 0.0),  // NaN.
-         last_texture_width(-1), last_texture_height(-1)
+         last_zoom(0.0 / 0.0)  // NaN.

 {
        register_int("direction", (int *)&direction);
        register_int("input_width", &input_width);
 {
        register_int("direction", (int *)&direction);
        register_int("input_width", &input_width);


@@ -466,14 +465,11 @@ SingleResamplePassEffect::SingleResamplePassEffect(ResampleEffect *parent)
        register_uniform_float("sample_x_offset", &uniform_sample_x_offset);
        register_uniform_float("whole_pixel_offset", &uniform_whole_pixel_offset);
 
        register_uniform_float("sample_x_offset", &uniform_sample_x_offset);
        register_uniform_float("whole_pixel_offset", &uniform_whole_pixel_offset);
 

-       glGenTextures(1, &texnum);
-

        call_once(lanczos_table_init_done, init_lanczos_table);
 }
 
 SingleResamplePassEffect::~SingleResamplePassEffect()
 {
        call_once(lanczos_table_init_done, init_lanczos_table);
 }
 
 SingleResamplePassEffect::~SingleResamplePassEffect()
 {

-       glDeleteTextures(1, &texnum);

 }
 
 string SingleResamplePassEffect::output_fragment_shader()
 }
 
 string SingleResamplePassEffect::output_fragment_shader()


@@ -518,17 +514,8 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
        // Encode as a two-component texture. Note the GL_REPEAT.
        glActiveTexture(GL_TEXTURE0 + *sampler_num);
        check_error();
        // Encode as a two-component texture. Note the GL_REPEAT.
        glActiveTexture(GL_TEXTURE0 + *sampler_num);
        check_error();

-       glBindTexture(GL_TEXTURE_2D, texnum);
+       glBindTexture(GL_TEXTURE_2D, tex.get_texnum());

        check_error();
        check_error();

-       if (last_texture_width == -1) {
-               // Need to set this state the first time.
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-               check_error();
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-               check_error();
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-               check_error();
-       }

 
        GLenum type, internal_format;
        void *pixels;
 
        GLenum type, internal_format;
        void *pixels;


@@ -543,19 +530,7 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
                pixels = weights.bilinear_weights_fp16.get();
        }
 
                pixels = weights.bilinear_weights_fp16.get();
        }
 

-       if (int(weights.src_bilinear_samples) == last_texture_width &&
-           int(weights.dst_samples) == last_texture_height &&
-           internal_format == last_texture_internal_format) {
-               // Texture dimensions and type are unchanged; it is more efficient
-               // to just update it rather than making an entirely new texture.
-               glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, weights.src_bilinear_samples, weights.dst_samples, GL_RG, type, pixels);
-       } else {
-               glTexImage2D(GL_TEXTURE_2D, 0, internal_format, weights.src_bilinear_samples, weights.dst_samples, 0, GL_RG, type, pixels);
-               last_texture_width = weights.src_bilinear_samples;
-               last_texture_height = weights.dst_samples;
-               last_texture_internal_format = internal_format;
-       }
-       check_error();
+       tex.update(weights.src_bilinear_samples, weights.dst_samples, internal_format, GL_RG, type, pixels);

 }
 
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset)
 }
 
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset)


@@ -715,7 +690,7 @@ void SingleResamplePassEffect::set_gl_state(GLuint glsl_program_num, const strin
 
        glActiveTexture(GL_TEXTURE0 + *sampler_num);
        check_error();
 
        glActiveTexture(GL_TEXTURE0 + *sampler_num);
        check_error();

-       glBindTexture(GL_TEXTURE_2D, texnum);
+       glBindTexture(GL_TEXTURE_2D, tex.get_texnum());

        check_error();
 
        uniform_sample_tex = *sampler_num;
        check_error();
 
        uniform_sample_tex = *sampler_num;


@@ -745,4 +720,44 @@ void SingleResamplePassEffect::set_gl_state(GLuint glsl_program_num, const strin
        }
 }
 
        }
 }
 

+Support2DTexture::Support2DTexture()
+{
+       glGenTextures(1, &texnum);
+       check_error();
+       glBindTexture(GL_TEXTURE_2D, texnum);
+       check_error();
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+       check_error();
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+       check_error();
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+       check_error();
+}
+
+Support2DTexture::~Support2DTexture()
+{
+       glDeleteTextures(1, &texnum);
+       check_error();
+}
+
+void Support2DTexture::update(GLint width, GLint height, GLenum internal_format, GLenum format, GLenum type, const GLvoid * data)
+{
+       glBindTexture(GL_TEXTURE_2D, texnum);
+       check_error();
+       if (width == last_texture_width &&
+           height == last_texture_height &&
+           internal_format == last_texture_internal_format) {
+               // Texture dimensions and type are unchanged; it is more efficient
+               // to just update it rather than making an entirely new texture.
+               glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, data);
+               check_error();
+       } else {
+               glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, data);
+               check_error();
+               last_texture_width = width;
+               last_texture_height = height;
+               last_texture_internal_format = internal_format;
+       }
+}
+

 }  // namespace movit
 }  // namespace movit

diff --git a/resample_effect.h b/resample_effect.h
index 4cde466c2d85de4a4b81bb5880399c197a11d63e..1822a3ea6b261fa833d59c4e4e2e0e276b83ca4b 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -46,6 +46,23 @@ struct ScalingWeights {
 };
 ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
 
 };
 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();
 class ResampleEffect : public Effect {
 public:
        ResampleEffect();


@@ -124,7 +141,6 @@ private:
        ResampleEffect *parent;
        EffectChain *chain;
        Direction direction;
        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;
        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;
        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
 };
 
 }  // namespace movit