X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=9c27cc8d66fc110132f43723e60f3c02211f14b7;hp=c7f417b873ddc64496d07e5311fa24e1c91c1127;hb=05842e6ea3346ae7f1f31c661c056d6031b83f24;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/flat_input.cpp b/flat_input.cpp
index c7f417b..9c27cc8 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,15 +1,13 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "flat_input.h"
 #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),
@@ -31,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 {
@@ -77,7 +75,7 @@ void FlatInput::finalize()
 	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 	check_error();
 
-	needs_update = false;
+	needs_update = true;
 	finalized = true;
 }