Prefix include guards with _MOVIT to avoid clashes with external files.

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 2e14488ea7d983da1cad04ea6a31fb99d4b06fb3..4728fb0805d26f1a7cb1814daf440a944755d7ad 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,13 +1,21 @@
-#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 "image_format.h"
+#include "init.h"
 #include "input.h"
 
 // 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, unsigned width, unsigned height);
+       FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
+       ~FlatInput();
 
        virtual std::string effect_type_id() const { return "FlatInput"; }
 
@@ -16,10 +24,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();
@@ -27,7 +52,9 @@ public:
        // Uploads the texture if it has changed since last time.
        void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);
 
-       ColorSpace get_color_space() const { return image_format.color_space; }
+       unsigned get_width() const { return width; }
+       unsigned get_height() const { return height; }
+       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
@@ -36,18 +63,21 @@ public:
        // on subsequent frames.
        void set_pixel_data(const unsigned char *pixel_data)
        {
+               assert(this->type == GL_UNSIGNED_BYTE);
                this->pixel_data = pixel_data;
                invalidate_pixel_data();
        }
 
-       void invalidate_pixel_data()
+       void set_pixel_data(const float *pixel_data)
        {
-               needs_update = true;
+               assert(this->type == GL_FLOAT);
+               this->pixel_data = pixel_data;
+               invalidate_pixel_data();
        }
 
-       const unsigned char *get_pixel_data() const
+       void invalidate_pixel_data()
        {
-               return pixel_data;
+               needs_update = true;
        }
 
        void set_pitch(unsigned pitch) {
@@ -55,19 +85,15 @@ public:
                this->pitch = pitch;
        }
 
-       unsigned get_pitch() {
-               return pitch;
-       }
-
 private:
        ImageFormat image_format;
        MovitPixelFormat pixel_format;
-       GLenum format;
+       GLenum format, type;
        GLuint pbo, texture_num;
        bool needs_update, finalized;
        int output_linear_gamma, needs_mipmaps;
        unsigned width, height, pitch, bytes_per_pixel;
-       const unsigned char *pixel_data;
+       const void *pixel_data;
 };
 
-#endif // !defined(_FLAT_INPUT_H)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)