Make the ResampleEffect accuracy test stricter.

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 1820eafda24c56248fcaa80b3af73caa7172d507..7875e2c793ce91778b2ae5598bc63da1112434fb 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,13 +1,24 @@
-#ifndef _FLAT_INPUT_H
-#define _FLAT_INPUT_H 1
+#ifndef _MOVIT_FLAT_INPUT_H
+#define _MOVIT_FLAT_INPUT_H 1
 
+#include <GL/glew.h>
+#include <assert.h>
+#include <string>
+
+#include "effect.h"
+#include "effect_chain.h"
+#include "image_format.h"
+#include "init.h"
 #include "input.h"
 
+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 {
 public:
        FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
+       ~FlatInput();
 
        virtual std::string effect_type_id() const { return "FlatInput"; }
 
@@ -16,10 +27,27 @@ public:
        // mipmap generation) at that point.
        void finalize();
 
-       // TODO: Check that we actually have the required extension.
        virtual bool can_output_linear_gamma() const {
-               return (image_format.gamma_curve == GAMMA_LINEAR ||
-                       image_format.gamma_curve == GAMMA_sRGB);
+               return (movit_srgb_textures_supported &&
+                       type == GL_UNSIGNED_BYTE &&
+                       (image_format.gamma_curve == GAMMA_LINEAR ||
+                        image_format.gamma_curve == GAMMA_sRGB));
+       }
+       virtual AlphaHandling alpha_handling() const {
+               switch (pixel_format) {
+               case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
+               case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
+                       return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
+               case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
+               case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
+                       return OUTPUT_POSTMULTIPLIED_ALPHA;
+               case FORMAT_RGB:
+               case FORMAT_BGR:
+               case FORMAT_GRAYSCALE:
+                       return OUTPUT_BLANK_ALPHA;
+               default:
+                       assert(false);
+               }
        }
 
        std::string output_fragment_shader();
@@ -29,46 +57,57 @@ public:
 
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
-       ColorSpace get_color_space() const { return image_format.color_space; }
+       Colorspace get_color_space() const { return image_format.color_space; }
        GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
 
        // Tells the input where to fetch the actual pixel data. Note that if you change
        // this data, you must either call set_pixel_data() again (using the same pointer
        // is fine), or invalidate_pixel_data(). Otherwise, the texture won't be re-uploaded
        // on subsequent frames.
-       void set_pixel_data(const unsigned char *pixel_data)
+       //
+       // The data can either be a regular pointer (if pbo==0), or a byte offset
+       // into a PBO. The latter will allow you to start uploading the texture data
+       // asynchronously to the GPU, if you have any CPU-intensive work between the
+       // call to set_pixel_data() and the actual rendering. In either case,
+       // the pointer (and PBO, if set) has to be valid at the time of the render call.
+       void set_pixel_data(const unsigned char *pixel_data, GLuint pbo = 0)
        {
                assert(this->type == GL_UNSIGNED_BYTE);
                this->pixel_data = pixel_data;
+               this->pbo = pbo;
                invalidate_pixel_data();
        }
 
-       void set_pixel_data(const float *pixel_data)
+       void set_pixel_data(const float *pixel_data, GLuint pbo = 0)
        {
                assert(this->type == GL_FLOAT);
                this->pixel_data = pixel_data;
+               this->pbo = pbo;
                invalidate_pixel_data();
        }
 
-       void invalidate_pixel_data()
-       {
-               needs_update = true;
-       }
+       void invalidate_pixel_data();
 
        void set_pitch(unsigned pitch) {
                assert(!finalized);
                this->pitch = pitch;
        }
 
+       virtual void inform_added(EffectChain *chain)
+       {
+               resource_pool = chain->get_resource_pool();
+       }
+
 private:
        ImageFormat image_format;
        MovitPixelFormat pixel_format;
-       GLenum format, type;
+       GLenum internal_format, format, type;
        GLuint pbo, texture_num;
-       bool needs_update, finalized;
+       bool finalized;
        int output_linear_gamma, needs_mipmaps;
-       unsigned width, height, pitch, bytes_per_pixel;
+       unsigned width, height, pitch;
        const void *pixel_data;
+       ResourcePool *resource_pool;
 };
 
-#endif // !defined(_FLAT_INPUT_H)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)