Merge branch 'master' into epoxy

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index c11d0a0123fcdb8bb4bd8bb4e60c26beed09692d..caa68b77900fcbff7e2db2ab7999e66f40d0d942 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -7,6 +7,7 @@
 
 #include "effect.h"
 #include "effect_chain.h"
+#include "fp16.h"
 #include "image_format.h"
 #include "init.h"
 #include "input.h"
@@ -38,6 +39,7 @@ public:
                case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
                case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
                        return OUTPUT_POSTMULTIPLIED_ALPHA;
+               case FORMAT_RG:
                case FORMAT_RGB:
                case FORMAT_BGR:
                case FORMAT_GRAYSCALE:
@@ -75,6 +77,14 @@ public:
                invalidate_pixel_data();
        }
 
+       void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+       {
+               assert(this->type == GL_HALF_FLOAT);
+               this->pixel_data = pixel_data;
+               this->pbo = pbo;
+               invalidate_pixel_data();
+       }
+
        void set_pixel_data(const float *pixel_data, GLuint pbo = 0)
        {
                assert(this->type == GL_FLOAT);