From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 9 Mar 2014 22:31:47 +0000 (+0100)
Subject: Add support for fp16 and RG textures to FlatInput.
X-Git-Tag: 1.0~26
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=2ac280559822777ea43bcc430835748f1953fd2e

Add support for fp16 and RG textures to FlatInput.
---

diff --git a/flat_input.cpp b/flat_input.cpp
index ed8e3e9..b8ea706 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_UNSIGNED_BYTE);
+	assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_BYTE);
 	register_int("output_linear_gamma", &output_linear_gamma);
 	register_int("needs_mipmaps", &needs_mipmaps);
 }
@@ -46,7 +46,17 @@ 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_RG) {
+				internal_format = GL_RG32F;
+			} else {
+				internal_format = GL_RGBA32F;
+			}
+		} else if (type == GL_HALF_FLOAT) {
+			if (pixel_format == FORMAT_RG) {
+				internal_format = GL_RG16F;
+			} else {
+				internal_format = GL_RGBA16F;
+			}
 		} else if (output_linear_gamma) {
 			assert(type == GL_UNSIGNED_BYTE);
 			internal_format = GL_SRGB8_ALPHA8;
@@ -66,6 +76,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);
 		}
diff --git a/flat_input.h b/flat_input.h
index dec0f1c..12a94d9 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -7,6 +7,7 @@
 
 #include "effect.h"
 #include "effect_chain.h"
+#include "fp16.h"
 #include "image_format.h"
 #include "init.h"
 #include "input.h"
@@ -38,6 +39,7 @@ public:
 		case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
 		case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
 			return OUTPUT_POSTMULTIPLIED_ALPHA;
+		case FORMAT_RG:
 		case FORMAT_RGB:
 		case FORMAT_BGR:
 		case FORMAT_GRAYSCALE:
@@ -75,6 +77,14 @@ public:
 		invalidate_pixel_data();
 	}
 
+	void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+	{
+		assert(this->type == GL_HALF_FLOAT);
+		this->pixel_data = pixel_data;
+		this->pbo = pbo;
+		invalidate_pixel_data();
+	}
+
 	void set_pixel_data(const float *pixel_data, GLuint pbo = 0)
 	{
 		assert(this->type == GL_FLOAT);
diff --git a/image_format.h b/image_format.h
index 77838ec..54983bf 100644
--- a/image_format.h
+++ b/image_format.h
@@ -20,7 +20,8 @@ enum MovitPixelFormat {
 	FORMAT_BGR,
 	FORMAT_BGRA_PREMULTIPLIED_ALPHA,
 	FORMAT_BGRA_POSTMULTIPLIED_ALPHA,
-	FORMAT_GRAYSCALE
+	FORMAT_GRAYSCALE,
+	FORMAT_RG
 };
 
 enum Colorspace {