X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=c11d0a0123fcdb8bb4bd8bb4e60c26beed09692d;hp=9fcaf53138ccfe7bfece184fb5bf2e3f24e1e462;hb=4f0f3a800365a9f928387ad108ac904af0a966e6;hpb=9cf78e3b5a801b7841133011f74fc7962861705d diff --git a/flat_input.h b/flat_input.h index 9fcaf53..c11d0a0 100644 --- a/flat_input.h +++ b/flat_input.h @@ -1,15 +1,20 @@ #ifndef _MOVIT_FLAT_INPUT_H #define _MOVIT_FLAT_INPUT_H 1 -#include +#include #include #include #include "effect.h" +#include "effect_chain.h" #include "image_format.h" #include "init.h" #include "input.h" +namespace movit { + +class ResourcePool; + // A FlatInput is the normal, “classic” case of an input, where everything // comes from a single 2D array with chunky pixels. class FlatInput : public Input { @@ -19,11 +24,6 @@ public: virtual std::string effect_type_id() const { return "FlatInput"; } - // Create the texture itself. We cannot do this in the constructor, - // because we don't necessarily know all the settings (sRGB texture, - // mipmap generation) at that point. - void finalize(); - virtual bool can_output_linear_gamma() const { return (movit_srgb_textures_supported && type == GL_UNSIGNED_BYTE && @@ -83,25 +83,29 @@ public: invalidate_pixel_data(); } - void invalidate_pixel_data() - { - needs_update = true; - } + void invalidate_pixel_data(); void set_pitch(unsigned pitch) { - assert(!finalized); this->pitch = pitch; + invalidate_pixel_data(); + } + + virtual void inform_added(EffectChain *chain) + { + resource_pool = chain->get_resource_pool(); } private: ImageFormat image_format; MovitPixelFormat pixel_format; - GLenum format, type; + GLenum type; GLuint pbo, texture_num; - bool needs_update, finalized; int output_linear_gamma, needs_mipmaps; unsigned width, height, pitch; const void *pixel_data; + ResourcePool *resource_pool; }; +} // namespace movit + #endif // !defined(_MOVIT_FLAT_INPUT_H)