Merge branch 'master' into epoxy

diff --git a/flat_input.cpp b/flat_input.cpp
index 6036cf724c30cf97202ba7e9a1906663d679bb32..55c65cc329181e0281b07184c8758eac73477f03 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -24,7 +24,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
          pitch(width),
          pixel_data(NULL)
 {
-       assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_BYTE);
+       assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_SHORT || type == GL_UNSIGNED_BYTE);
        register_int("output_linear_gamma", &output_linear_gamma);
        register_int("needs_mipmaps", &needs_mipmaps);
 }
@@ -46,17 +46,29 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
                GLint internal_format;
                GLenum format;
                if (type == GL_FLOAT) {
-                       if (pixel_format == FORMAT_RG) {
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R32F;
+                       } else if (pixel_format == FORMAT_RG) {
                                internal_format = GL_RG32F;
                        } else {
                                internal_format = GL_RGBA32F;
                        }
                } else if (type == GL_HALF_FLOAT) {
-                       if (pixel_format == FORMAT_RG) {
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R16F;
+                       } else if (pixel_format == FORMAT_RG) {
                                internal_format = GL_RG16F;
                        } else {
                                internal_format = GL_RGBA16F;
                        }
+               } else if (type == GL_UNSIGNED_SHORT) {
+                       if (pixel_format == FORMAT_R) {
+                               internal_format = GL_R16;
+                       } else if (pixel_format == FORMAT_RG) {
+                               internal_format = GL_RG16;
+                       } else {
+                               internal_format = GL_RGBA16;
+                       }
                } else if (output_linear_gamma) {
                        assert(type == GL_UNSIGNED_BYTE);
                        internal_format = GL_SRGB8_ALPHA8;

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;

diff --git a/image_format.h b/image_format.h
index 54983bf8ef2a167105c303823502177174e62cad..1bd19f953e6ddc27102baf601229a44eb8b33cbd 100644 (file)
--- a/image_format.h
+++ b/image_format.h
@@ -21,7 +21,8 @@ enum MovitPixelFormat {
        FORMAT_BGRA_PREMULTIPLIED_ALPHA,
        FORMAT_BGRA_POSTMULTIPLIED_ALPHA,
        FORMAT_GRAYSCALE,
-       FORMAT_RG
+       FORMAT_RG,
+       FORMAT_R
 };
 
 enum Colorspace {