X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=flat_input.cpp;h=9cb9b9c5b377f356f593346f18886ba19ef2d20f;hb=c59abdb997a1d1d703ac5dd71513dea03628a53e;hp=b37a1ec97d0392568c8f8ca49dfdb3dbde30b82b;hpb=af39090a8902411ffc0c89f296a0f8bde9229f60;p=movit

diff --git a/flat_input.cpp b/flat_input.cpp
index b37a1ec..9cb9b9c 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,9 +1,9 @@
 #include <string.h>
 #include <assert.h>
+#include <GL/glew.h>
 
 #include "flat_input.h"
 #include "util.h"
-#include "opengl.h"
 
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
 	: image_format(image_format),
@@ -17,7 +17,8 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 	  needs_mipmaps(false),
 	  width(width),
 	  height(height),
-	  pitch(width)
+	  pitch(width),
+	  pixel_data(NULL)
 {
 	assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE);
 	register_int("output_linear_gamma", &output_linear_gamma);
@@ -44,7 +45,7 @@ void FlatInput::finalize()
 		internal_format = GL_RGBA16F_ARB;
 	} else if (output_linear_gamma) {
 		assert(type == GL_UNSIGNED_BYTE);
-		internal_format = GL_SRGB8;
+		internal_format = GL_SRGB8_ALPHA8;
 	} else {
 		assert(type == GL_UNSIGNED_BYTE);
 		internal_format = GL_RGBA8;
@@ -52,13 +53,15 @@ void FlatInput::finalize()
 	if (pixel_format == FORMAT_RGB) {
 		format = GL_RGB;
 		bytes_per_pixel = 3;
-	} else if (pixel_format == FORMAT_RGBA) {
+	} else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA ||
+	           pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) {
 		format = GL_RGBA;
 		bytes_per_pixel = 4;
 	} else if (pixel_format == FORMAT_BGR) {
 		format = GL_BGR;
 		bytes_per_pixel = 3;
-	} else if (pixel_format == FORMAT_BGRA) {
+	} else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA ||
+	           pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) {
 		format = GL_BGRA;
 		bytes_per_pixel = 4;
 	} else if (pixel_format == FORMAT_GRAYSCALE) {