X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=ycbcr_input.cpp;h=87140be7828064535972aa10d75cb4675ba11124;hp=d1d849a2038e6a0d58958de61954e6d3edab10a0;hb=a164e03033bce0a1fff8044468b12e600722b188;hpb=9b95345e8e1dde29991638ed69def0cf187e28de

diff --git a/ycbcr_input.cpp b/ycbcr_input.cpp
index d1d849a..87140be 100644
--- a/ycbcr_input.cpp
+++ b/ycbcr_input.cpp
@@ -6,6 +6,7 @@
 #include <string.h>
 
 #include "effect_util.h"
+#include "resource_pool.h"
 #include "util.h"
 #include "ycbcr_input.h"
 
@@ -62,7 +63,6 @@ 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),
@@ -88,45 +88,22 @@ YCbCrInput::YCbCrInput(const ImageFormat &image_format,
 
 YCbCrInput::~YCbCrInput()
 {
-	if (pbos[0] != 0) {
-		glDeleteBuffers(3, pbos);
-		check_error();
-	}
-	if (texture_num[0] != 0) {
-		glDeleteTextures(3, texture_num);
-		check_error();
+	for (unsigned channel = 0; channel < 3; ++channel) {
+		if (texture_num[channel] != 0) {
+			resource_pool->release_2d_texture(texture_num[channel]);
+		}
 	}
 }
 
 void YCbCrInput::finalize()
 {
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	check_error();
-
-	// Create PBOs to hold the textures holding the input image, and then the texture itself.
-	glGenBuffers(3, pbos);
-	check_error();
-	glGenTextures(3, texture_num);
-	check_error();
-
+	// Create the textures themselves.
 	for (unsigned channel = 0; channel < 3; ++channel) {
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbos[channel]);
-		check_error();
-		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch[channel] * heights[channel], NULL, GL_STREAM_DRAW);
-		check_error();
-		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-		check_error();
-		
+		texture_num[channel] = resource_pool->create_2d_texture(GL_LUMINANCE8, widths[channel], heights[channel]);
 		glBindTexture(GL_TEXTURE_2D, texture_num[channel]);
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		check_error();
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
-		check_error();
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8, widths[channel], heights[channel], 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
-		check_error();
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-		check_error();
 	}
 
 	needs_update = true;
@@ -141,27 +118,16 @@ 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 || needs_pbo_recreate) {
+		if (needs_update) {
+			// Re-upload the texture.
 			// 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);
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 			check_error();
-
-			// Re-upload the texture from the PBO.
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch[channel]);
 			check_error();
-			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_LUMINANCE, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, widths[channel], heights[channel], GL_LUMINANCE, GL_UNSIGNED_BYTE, pixel_data[channel]);
 			check_error();
 			glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 			check_error();
@@ -169,11 +135,12 @@ void YCbCrInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix
 			check_error();
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 			check_error();
-			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-			check_error();
 		}
 	}
 
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+	check_error();
+
 	// Bind samplers.
 	set_uniform_int(glsl_program_num, prefix, "tex_y", *sampler_num + 0);
 	set_uniform_int(glsl_program_num, prefix, "tex_cb", *sampler_num + 1);
@@ -181,7 +148,6 @@ 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()