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

diff --git a/flat_input.cpp b/flat_input.cpp
index d19cd4e..5978ca3 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <assert.h>
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 
 #include "effect_util.h"
 #include "flat_input.h"
@@ -9,6 +9,8 @@
 
 using namespace std;
 
+namespace movit {
+
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
 	: image_format(image_format),
           pixel_format(pixel_format),
@@ -22,7 +24,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 	  pitch(width),
 	  pixel_data(NULL)
 {
-	assert(type == GL_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);
 }
@@ -44,13 +46,41 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 		GLint internal_format;
 		GLenum format;
 		if (type == GL_FLOAT) {
-			internal_format = GL_RGBA32F_ARB;
+			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_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;
@@ -64,6 +94,8 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 			format = GL_BGRA;
 		} else if (pixel_format == FORMAT_GRAYSCALE) {
 			format = GL_LUMINANCE;
+		} else if (pixel_format == FORMAT_RG) {
+			format = GL_RG;
 		} else {
 			assert(false);
 		}
@@ -118,3 +150,5 @@ void FlatInput::invalidate_pixel_data()
 		texture_num = 0;
 	}
 }
+
+}  // namespace movit