X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=b37a1ec97d0392568c8f8ca49dfdb3dbde30b82b;hp=6481bc25e9543927480999cb32c838781db6b082;hb=9e62fbe2ac764479c449472d8bda52ac4df0de91;hpb=7c293685d872fbde282a430067d18f35b9fb7ab6

diff --git a/flat_input.cpp b/flat_input.cpp
index 6481bc2..b37a1ec 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -9,6 +9,8 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 	: 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.
@@ -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);
@@ -107,7 +123,7 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 		// Re-upload the texture from the PBO.
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);
 		check_error();
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, GL_FLOAT, BUFFER_OFFSET(0));
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, BUFFER_OFFSET(0));
 		check_error();
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 		check_error();