X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=5978ca3b51c4116441933537a6168707f210d44a;hp=6036cf724c30cf97202ba7e9a1906663d679bb32;hb=bd98e07fa5ba3cb783e8e9d16ab4cc93a9fa3100;hpb=1320ed72d619610b9f056c106496dfe7dbd95e06

diff --git a/flat_input.cpp b/flat_input.cpp
index 6036cf7..5978ca3 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,23 +46,41 @@ 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;
 		} else {
 			assert(type == GL_UNSIGNED_BYTE);
-			internal_format = GL_RGBA8;
+			if (pixel_format == FORMAT_R) {
+				internal_format = GL_R8;
+			} else if (pixel_format == FORMAT_RG) {
+				internal_format = GL_RG8;
+			} else {
+				internal_format = GL_RGBA8;
+			}
 		}
 		if (pixel_format == FORMAT_RGB) {
 			format = GL_RGB;