X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=56a9951bb73ab070f0ad91b8b0f464bfe633055e;hp=f8e36ca2f610eecc607d1da1bdfd291ae8c9a1ec;hb=3fbc6a0e7ecc008b0bdafcbc576b79c24117859e;hpb=ab636361e865c389fe60584562372ec39ac4c511

diff --git a/flat_input.cpp b/flat_input.cpp
index f8e36ca..56a9951 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -5,8 +5,9 @@
 #include "util.h"
 #include "opengl.h"
 
-FlatInput::FlatInput(ImageFormat image_format, unsigned width, unsigned height)
+FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, unsigned width, unsigned height)
 	: image_format(image_format),
+          pixel_format(pixel_format),
 	  needs_update(false),
 	  finalized(false),
 	  output_linear_gamma(false),
@@ -28,19 +29,19 @@ void FlatInput::finalize()
 	} else {
 		internal_format = GL_RGBA8;
 	}
-	if (image_format.pixel_format == FORMAT_RGB) {
+	if (pixel_format == FORMAT_RGB) {
 		format = GL_RGB;
 		bytes_per_pixel = 3;
-	} else if (image_format.pixel_format == FORMAT_RGBA) {
+	} else if (pixel_format == FORMAT_RGBA) {
 		format = GL_RGBA;
 		bytes_per_pixel = 4;
-	} else if (image_format.pixel_format == FORMAT_BGR) {
+	} else if (pixel_format == FORMAT_BGR) {
 		format = GL_BGR;
 		bytes_per_pixel = 3;
-	} else if (image_format.pixel_format == FORMAT_BGRA) {
+	} else if (pixel_format == FORMAT_BGRA) {
 		format = GL_BGRA;
 		bytes_per_pixel = 4;
-	} else if (image_format.pixel_format == FORMAT_GRAYSCALE) {
+	} else if (pixel_format == FORMAT_GRAYSCALE) {
 		format = GL_LUMINANCE;
 		bytes_per_pixel = 1;
 	} else {