X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=a73518d4ad2797f274f2dad2cac6ebf6a281a0ff;hp=a0b9abf2933fa602e75a4dac7715f6c3cf962839;hb=abb7221a797bb5332f9ff9346396beb4c95dcc34;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index a0b9abf..a73518d 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -1,12 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "ycbcr_input.h"
 #include "util.h"
+#include "opengl.h"
 
 YCbCrInput::YCbCrInput(const ImageFormat &image_format,
                        const YCbCrFormat &ycbcr_format,
@@ -14,6 +11,7 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 	: image_format(image_format),
 	  ycbcr_format(ycbcr_format),
 	  needs_update(false),
+	  needs_pbo_recreate(false),
 	  finalized(false),
 	  needs_mipmaps(false),
 	  width(width),
@@ -74,12 +72,20 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
 		glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
 		check_error();
 
-		if (needs_update) {
+		if (needs_update || needs_pbo_recreate) {
 			// Copy the pixel data into the PBO.
 			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
 			check_error();
+
+			if (needs_pbo_recreate) {
+				// The pitch has changed; we need to reallocate this PBO.
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch[channel] * heights[channel], NULL, GL_STREAM_DRAW);
+				check_error();
+			}
+
 			void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
 			memcpy(mapped_pbo, pixel_data[channel], pitch[channel] * heights[channel]);
+
 			glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
 			check_error();
 
@@ -106,6 +112,7 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
 
 	*sampler_num += 3;
 	needs_update = false;
+	needs_pbo_recreate = false;
 }
 
 std::string YCbCrInput::output_fragment_shader()