X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=8f24d86f9347b408b8edb2a9f24c677155b35591;hp=c7f417b873ddc64496d07e5311fa24e1c91c1127;hb=8e9f58fec54a4c879035b214fd7411f6ff7b3a32;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/flat_input.cpp b/flat_input.cpp
index c7f417b..8f24d86 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,125 +1,198 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
+#include <epoxy/gl.h>
 
+#include "effect_util.h"
 #include "flat_input.h"
+#include "resource_pool.h"
 #include "util.h"
 
-FlatInput::FlatInput(ImageFormat image_format, unsigned width, unsigned height)
+using namespace std;
+
+namespace movit {
+
+FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format_in, GLenum type, unsigned width, unsigned height)
 	: image_format(image_format),
-	  needs_update(false),
-	  finalized(false),
+	  type(type),
+	  pbo(0),
+	  texture_num(0),
 	  output_linear_gamma(false),
 	  needs_mipmaps(false),
 	  width(width),
 	  height(height),
-	  pitch(width)
+	  pitch(width),
+	  owns_texture(false),
+	  pixel_data(NULL),
+	  fixup_swap_rb(false),
+	  fixup_red_to_grayscale(false)
 {
+	assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_SHORT || type == GL_UNSIGNED_BYTE);
 	register_int("output_linear_gamma", &output_linear_gamma);
 	register_int("needs_mipmaps", &needs_mipmaps);
-}
+	register_uniform_sampler2d("tex", &uniform_tex);
 
-void FlatInput::finalize()
-{
-	// Translate the input format to OpenGL's enums.
-	GLenum internal_format;
-	if (output_linear_gamma) {
-		internal_format = GL_SRGB8;
-	} else {
-		internal_format = GL_RGBA8;
+	// Some types are not supported in all GL versions (e.g. GLES),
+	// and will corrected into the right format in the shader.
+	switch (pixel_format_in) {
+	case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
+		pixel_format = FORMAT_RGBA_PREMULTIPLIED_ALPHA;
+		fixup_swap_rb = true;
+		break;
+	case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
+		pixel_format = FORMAT_RGBA_POSTMULTIPLIED_ALPHA;
+		fixup_swap_rb = true;
+		break;
+	case FORMAT_BGR:
+		pixel_format = FORMAT_RGB;
+		fixup_swap_rb = true;
+		break;
+	case FORMAT_GRAYSCALE:
+		pixel_format = FORMAT_R;
+		fixup_red_to_grayscale = true;
+		break;
+	default:
+		pixel_format = pixel_format_in;
+		break;
 	}
-	if (image_format.pixel_format == FORMAT_RGB) {
-		format = GL_RGB;
-		bytes_per_pixel = 3;
-	} else if (image_format.pixel_format == FORMAT_RGBA) {
-		format = GL_RGBA;
-		bytes_per_pixel = 4;
-	} else if (image_format.pixel_format == FORMAT_BGR) {
-		format = GL_BGR;
-		bytes_per_pixel = 3;
-	} else if (image_format.pixel_format == FORMAT_BGRA) {
-		format = GL_BGRA;
-		bytes_per_pixel = 4;
-	} else if (image_format.pixel_format == FORMAT_GRAYSCALE) {
-		format = GL_LUMINANCE;
-		bytes_per_pixel = 1;
-	} else {
-		assert(false);
-	}
-
-	// Create PBO to hold the texture holding the input image, and then the texture itself.
-	glGenBuffers(1, &pbo);
-	check_error();
-	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
-	check_error();
-	glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, pitch * height * bytes_per_pixel, NULL, GL_STREAM_DRAW);
-	check_error();
-	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-	check_error();
-	
-	glGenTextures(1, &texture_num);
-	check_error();
-	glBindTexture(GL_TEXTURE_2D, texture_num);
-	check_error();
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	check_error();
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);
-	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);
-	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
-	check_error();
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-	check_error();
+}
 
-	needs_update = false;
-	finalized = true;
+FlatInput::~FlatInput()
+{
+	possibly_release_texture();
 }
-	
-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) {
-		// Copy the pixel data into the PBO.
+	if (texture_num == 0 && (pbo != 0 || pixel_data != NULL)) {
+		// Translate the input format to OpenGL's enums.
+		GLint internal_format;
+		GLenum format;
+		if (type == GL_FLOAT) {
+			if (pixel_format == FORMAT_R) {
+				internal_format = GL_R32F;
+			} else if (pixel_format == FORMAT_RG) {
+				internal_format = GL_RG32F;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB32F;
+			} else {
+				internal_format = GL_RGBA32F;
+			}
+		} else if (type == GL_HALF_FLOAT) {
+			if (pixel_format == FORMAT_R) {
+				internal_format = GL_R16F;
+			} else if (pixel_format == FORMAT_RG) {
+				internal_format = GL_RG16F;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB16F;
+			} else {
+				internal_format = GL_RGBA16F;
+			}
+		} else if (type == GL_UNSIGNED_SHORT) {
+			if (pixel_format == FORMAT_R) {
+				internal_format = GL_R16;
+			} else if (pixel_format == FORMAT_RG) {
+				internal_format = GL_RG16;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB16;
+			} else {
+				internal_format = GL_RGBA16;
+			}
+		} else if (output_linear_gamma) {
+			assert(type == GL_UNSIGNED_BYTE);
+			if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_SRGB8;
+			} else if (pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) {
+				internal_format = GL_SRGB8_ALPHA8;
+			} else {
+				assert(false);
+			}
+		} else {
+			assert(type == GL_UNSIGNED_BYTE);
+			if (pixel_format == FORMAT_R) {
+				internal_format = GL_R8;
+			} else if (pixel_format == FORMAT_RG) {
+				internal_format = GL_RG8;
+			} else if (pixel_format == FORMAT_RGB) {
+				internal_format = GL_RGB8;
+			} else {
+				internal_format = GL_RGBA8;
+			}
+		}
+		if (pixel_format == FORMAT_RGB) {
+			format = GL_RGB;
+		} else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA ||
+			   pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) {
+			format = GL_RGBA;
+		} else if (pixel_format == FORMAT_RG) {
+			format = GL_RG;
+		} else if (pixel_format == FORMAT_R) {
+			format = GL_RED;
+		} else {
+			assert(false);
+		}
+
+		// (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();
-		void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
-		memcpy(mapped_pbo, pixel_data, pitch * height * bytes_per_pixel);
-		glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
+		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();
-
-		// 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_UNSIGNED_BYTE, BUFFER_OFFSET(0));
+		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();
+		}
+		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;
+		owns_texture = true;
+	} else {
+		glBindTexture(GL_TEXTURE_2D, texture_num);
+		check_error();
 	}
 
 	// Bind it to a sampler.
-	set_uniform_int(glsl_program_num, prefix, "tex", *sampler_num);
+	uniform_tex = *sampler_num;
 	++*sampler_num;
 }
 
-std::string FlatInput::output_fragment_shader()
+string FlatInput::output_fragment_shader()
+{
+	char buf[256];
+	sprintf(buf, "#define FIXUP_SWAP_RB %d\n#define FIXUP_RED_TO_GRAYSCALE %d\n",
+		fixup_swap_rb, fixup_red_to_grayscale);
+	return buf + read_file("flat_input.frag");
+}
+
+void FlatInput::invalidate_pixel_data()
 {
-	return read_file("flat_input.frag");
+	possibly_release_texture();
 }
+
+void FlatInput::possibly_release_texture()
+{
+	if (texture_num != 0 && owns_texture) {
+		resource_pool->release_2d_texture(texture_num);
+		texture_num = 0;
+		owns_texture = false;
+	}
+}
+
+}  // namespace movit