X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=70cc10984cc2b2397f4ee109853cdf5bc0ccfc08;hp=31800a74a28c69dc7368d47e48c7ce77cfa1431a;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=f898f4106a13b1efdbad85037781f785c2064a76 diff --git a/flat_input.cpp b/flat_input.cpp index 31800a7..70cc109 100644 --- a/flat_input.cpp +++ b/flat_input.cpp @@ -1,9 +1,13 @@ #include #include +#include +#include "effect_util.h" #include "flat_input.h" +#include "resource_pool.h" #include "util.h" -#include "opengl.h" + +using namespace std; FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height) : image_format(image_format), @@ -11,13 +15,13 @@ 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), width(width), height(height), - pitch(width) + pitch(width), + pixel_data(NULL) { assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE); register_int("output_linear_gamma", &output_linear_gamma); @@ -26,103 +30,68 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL FlatInput::~FlatInput() { - if (pbo != 0) { - glDeleteBuffers(1, &pbo); - check_error(); - } 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; + internal_format = GL_SRGB8_ALPHA8; } else { assert(type == GL_UNSIGNED_BYTE); internal_format = GL_RGBA8; } if (pixel_format == FORMAT_RGB) { format = GL_RGB; - bytes_per_pixel = 3; - } else if (pixel_format == FORMAT_RGBA) { + } else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA || + pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) { format = GL_RGBA; - bytes_per_pixel = 4; } else if (pixel_format == FORMAT_BGR) { format = GL_BGR; - bytes_per_pixel = 3; - } else if (pixel_format == FORMAT_BGRA) { + } else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA || + pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) { format = GL_BGRA; - bytes_per_pixel = 4; } else if (pixel_format == FORMAT_GRAYSCALE) { format = GL_LUMINANCE; - bytes_per_pixel = 1; } else { assert(false); } - if (type == GL_FLOAT) { - bytes_per_pixel *= sizeof(float); - } - // 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, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : 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 ? 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(); - - 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) { - // Copy the pixel data into the PBO. + 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(); - 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, type, 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); @@ -131,8 +100,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. @@ -140,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; + } +}