X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=a9d01a72f920b2409849165df1efcb776eb1dada;hp=291bb0dcc3a08ce5c9024cd29153883907a0f0eb;hb=207384d5c7b8ce40e57decb0160c91da70d54ee6;hpb=29072985d0a00a53e5b578a1444cee61a0c9e1f2

diff --git a/flat_input.cpp b/flat_input.cpp
index 291bb0d..a9d01a7 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -44,7 +44,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 +52,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) {