X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=0a8139224c2feb037fa177fa31f32dfcbcde627c;hp=b14772554b720486fa842c1b27ec4b23639b9715;hb=0f37f626e3c445593e2008357622441977fa3a32;hpb=99d570aa1e5e72e6c2adcb8401b1451738e7dec2

diff --git a/flat_input.cpp b/flat_input.cpp
index b147725..0a81392 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -4,6 +4,7 @@
 
 #include "effect_util.h"
 #include "flat_input.h"
+#include "resource_pool.h"
 #include "util.h"
 
 FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
@@ -12,7 +13,6 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 	  type(type),
 	  pbo(0),
 	  texture_num(0),
-	  needs_update(false),
 	  finalized(false),
 	  output_linear_gamma(false),
 	  needs_mipmaps(false),
@@ -29,15 +29,13 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
 FlatInput::~FlatInput()
 {
 	if (texture_num != 0) {
-		glDeleteTextures(1, &texture_num);
-		check_error();
+		resource_pool->release_2d_texture(texture_num);
 	}
 }
 
 void FlatInput::finalize()
 {
 	// Translate the input format to OpenGL's enums.
-	GLenum internal_format;
 	if (type == GL_FLOAT) {
 		internal_format = GL_RGBA32F_ARB;
 	} else if (output_linear_gamma) {
@@ -63,21 +61,6 @@ void FlatInput::finalize()
 		assert(false);
 	}
 
-	// Create the texture itself.
-	glGenTextures(1, &texture_num);
-	check_error();
-	glBindTexture(GL_TEXTURE_2D, texture_num);
-	check_error();
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
-	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, NULL);
-	check_error();
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	check_error();
-	glBindTexture(GL_TEXTURE_2D, 0);
-	check_error();
-
-	needs_update = true;
 	finalized = true;
 }
 	
@@ -85,19 +68,24 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 {
 	glActiveTexture(GL_TEXTURE0 + *sampler_num);
 	check_error();
-	glBindTexture(GL_TEXTURE_2D, texture_num);
-	check_error();
 
-	if (needs_update) {
-		// Re-upload the texture.
+	if (texture_num == 0) {
+		// (Re-)upload the texture.
+		texture_num = resource_pool->create_2d_texture(internal_format, width, height);
+		glBindTexture(GL_TEXTURE_2D, texture_num);
+		check_error();
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
 		check_error();
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
+		check_error();
 		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 		check_error();
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);
 		check_error();
 		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, pixel_data);
 		check_error();
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+		check_error();
 		if (needs_mipmaps) {
 			glGenerateMipmap(GL_TEXTURE_2D);
 			check_error();
@@ -110,8 +98,9 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 		check_error();
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 		check_error();
-
-		needs_update = false;
+	} else {
+		glBindTexture(GL_TEXTURE_2D, texture_num);
+		check_error();
 	}
 
 	// Bind it to a sampler.
@@ -123,3 +112,11 @@ std::string FlatInput::output_fragment_shader()
 {
 	return read_file("flat_input.frag");
 }
+
+void FlatInput::invalidate_pixel_data()
+{
+	if (texture_num != 0) {
+		resource_pool->release_2d_texture(texture_num);
+		texture_num = 0;
+	}
+}