Merge branch 'master' into epoxy

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 5f3faedc86d29d1baa24ed7f49ae7fbb04a4596e..8ac98ba64a3b0f1dce1968d39dafe0d0350860e0 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -78,7 +78,15 @@ public:
                invalidate_pixel_data();
        }
 
-       void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+       void set_pixel_data(const unsigned short *pixel_data, GLuint pbo = 0)
+       {
+               assert(this->type == GL_UNSIGNED_SHORT);
+               this->pixel_data = pixel_data;
+               this->pbo = pbo;
+               invalidate_pixel_data();
+       }
+
+       void set_pixel_data_fp16(const fp16_int_t *pixel_data, GLuint pbo = 0)
        {
                assert(this->type == GL_HALF_FLOAT);
                this->pixel_data = pixel_data;