X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=24b5709874ba9318aaa74b01508e51f6250d7bd0;hp=55c65cc329181e0281b07184c8758eac73477f03;hb=c268718e844e9b92dbb461b8e55fc4a578876140;hpb=97f04cf3de39851ba0808aace31866afa9a9f500

diff --git a/flat_input.cpp b/flat_input.cpp
index 55c65cc..24b5709 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -50,6 +50,8 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 				internal_format = GL_R32F;
 			} else if (pixel_format == FORMAT_RG) {
 				internal_format = GL_RG32F;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB32F;
 			} else {
 				internal_format = GL_RGBA32F;
 			}
@@ -58,6 +60,8 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 				internal_format = GL_R16F;
 			} else if (pixel_format == FORMAT_RG) {
 				internal_format = GL_RG16F;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB16F;
 			} else {
 				internal_format = GL_RGBA16F;
 			}
@@ -66,6 +70,8 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 				internal_format = GL_R16;
 			} else if (pixel_format == FORMAT_RG) {
 				internal_format = GL_RG16;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB16;
 			} else {
 				internal_format = GL_RGBA16;
 			}
@@ -74,7 +80,15 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsi
 			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 if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB8;
+			} else {
+				internal_format = GL_RGBA8;
+			}
 		}
 		if (pixel_format == FORMAT_RGB) {
 			format = GL_RGB;