]> git.sesse.net Git - movit/blobdiff - flat_input.cpp
Redo FBO association yet again, this time per-texture.
[movit] / flat_input.cpp
index cf53034a372078dadf56d99e280397c5d236bd04..a95b90e563f9d268378461dc196f67b282c4a670 100644 (file)
@@ -4,16 +4,19 @@
 
 #include "effect_util.h"
 #include "flat_input.h"
+#include "resource_pool.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 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),
          width(width),
@@ -21,7 +24,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GL
          pitch(width),
          pixel_data(NULL)
 {
-       assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE);
+       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);
 }
@@ -29,73 +32,82 @@ 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) {
-               assert(type == GL_UNSIGNED_BYTE);
-               internal_format = GL_SRGB8_ALPHA8;
-       } else {
-               assert(type == GL_UNSIGNED_BYTE);
-               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_BGR) {
-               format = GL_BGR;
-       } else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA ||
-                  pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) {
-               format = GL_BGRA;
-       } else if (pixel_format == FORMAT_GRAYSCALE) {
-               format = GL_LUMINANCE;
-       } else {
-               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) {
+               // 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 {
+                               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 {
+                               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 {
+                               internal_format = GL_RGBA16;
+                       }
+               } else if (output_linear_gamma) {
+                       assert(type == GL_UNSIGNED_BYTE);
+                       internal_format = GL_SRGB8_ALPHA8;
+               } 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 {
+                               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_BGR) {
+                       format = GL_BGR;
+               } else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA ||
+                          pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) {
+                       format = GL_BGRA;
+               } else if (pixel_format == FORMAT_GRAYSCALE) {
+                       format = GL_LUMINANCE;
+               } else if (pixel_format == FORMAT_RG) {
+                       format = GL_RG;
+               } 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();
+               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 +116,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 +138,17 @@ 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;
+       }
+}
+
+}  // namespace movit