X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=70cc10984cc2b2397f4ee109853cdf5bc0ccfc08;hp=28380f4ad19a94a763292ae85f79ab6578e1b216;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=9cf78e3b5a801b7841133011f74fc7962861705d

diff --git a/flat_input.cpp b/flat_input.cpp
index 28380f4..70cc109 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -4,15 +4,17 @@
 
 #include "effect_util.h"
 #include "flat_input.h"
+#include "resource_pool.h"
 #include "util.h"
 
+using namespace std;
+
 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),
 	  needs_mipmaps(false),
@@ -29,17 +31,15 @@ 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_RGBA16F_ARB;
+		internal_format = GL_RGBA32F_ARB;
 	} else if (output_linear_gamma) {
 		assert(type == GL_UNSIGNED_BYTE);
 		internal_format = GL_SRGB8_ALPHA8;
@@ -63,39 +63,23 @@ 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();
-	// Intel/Mesa seems to have a broken glGenerateMipmap() for non-FBO textures, so do it here
-	// instead of calling glGenerateMipmap().
-	glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, needs_mipmaps ? GL_TRUE : GL_FALSE);
-	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;
 }
 	
-void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+void FlatInput::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 {
 	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);
@@ -104,14 +88,21 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 		check_error();
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 		check_error();
+		if (needs_mipmaps) {
+			glGenerateMipmap(GL_TEXTURE_2D);
+			check_error();
+		}
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 		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();
-
-		needs_update = false;
+	} else {
+		glBindTexture(GL_TEXTURE_2D, texture_num);
+		check_error();
 	}
 
 	// Bind it to a sampler.
@@ -119,7 +110,15 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 	++*sampler_num;
 }
 
-std::string FlatInput::output_fragment_shader()
+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;
+	}
+}