From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 11 Mar 2014 20:18:44 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~35
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=dc03e3b0a5b0bbe8c6cdf5da9bc72376f79857b4;hp=1320ed72d619610b9f056c106496dfe7dbd95e06

Merge branch 'master' into epoxy
---

diff --git a/flat_input.cpp b/flat_input.cpp
index 6036cf7..55c65cc 100644
--- 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 5f3faed..8ac98ba 100644
--- 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 54983bf..1bd19f9 100644
--- 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 {