X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=6e118bc3a3c1b5633bc786772ce85d377fffb9ed;hp=089008344c3f457468146203b84fbad5a638e527;hb=36ae69017f10987948009bf6f602da5f94e4f780;hpb=42b10f3a940eb05016764d1a30417ae7f21ae1f3

diff --git a/flat_input.cpp b/flat_input.cpp
index 0890083..6e118bc 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,14 +1,16 @@
 #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),
           pixel_format(pixel_format),
 	  type(type),
+	  pbo(0),
+	  texture_num(0),
 	  needs_update(false),
 	  finalized(false),
 	  output_linear_gamma(false),
@@ -22,6 +24,18 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 	register_int("needs_mipmaps", &needs_mipmaps);
 }
 
+FlatInput::~FlatInput()
+{
+	if (pbo != 0) {
+		glDeleteBuffers(1, &pbo);
+		check_error();
+	}
+	if (texture_num != 0) {
+		glDeleteTextures(1, &texture_num);
+		check_error();
+	}
+}
+
 void FlatInput::finalize()
 {
 	// Translate the input format to OpenGL's enums.
@@ -30,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;
@@ -71,6 +85,8 @@ void FlatInput::finalize()
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, texture_num);
 	check_error();
+	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	check_error();
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
 	check_error();
 	glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);