Add a test for DeconvolutionSharpenEffect. Not completely done yet, but basic functio...

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 56a9951bb73ab070f0ad91b8b0f464bfe633055e..0516083bf30c13dc32cf2447718141ed08e4a038 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -5,9 +5,10 @@
 #include "util.h"
 #include "opengl.h"
 
-FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, unsigned width, unsigned height)
+FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
        : image_format(image_format),
           pixel_format(pixel_format),
+         type(type),
          needs_update(false),
          finalized(false),
          output_linear_gamma(false),
@@ -16,6 +17,7 @@ FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, un
          height(height),
          pitch(width)
 {
+       assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE);
        register_int("output_linear_gamma", &output_linear_gamma);
        register_int("needs_mipmaps", &needs_mipmaps);
 }
@@ -24,9 +26,13 @@ void FlatInput::finalize()
 {
        // Translate the input format to OpenGL's enums.
        GLenum internal_format;
-       if (output_linear_gamma) {
+       if (type == GL_FLOAT) {
+               internal_format = GL_RGBA16F_ARB;
+       } else if (output_linear_gamma) {
+               assert(type == GL_UNSIGNED_BYTE);
                internal_format = GL_SRGB8;
        } else {
+               assert(type == GL_UNSIGNED_BYTE);
                internal_format = GL_RGBA8;
        }
        if (pixel_format == FORMAT_RGB) {
@@ -47,6 +53,9 @@ void FlatInput::finalize()
        } 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);
@@ -70,12 +79,12 @@ void FlatInput::finalize()
        // 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);
+       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 = false;
+       needs_update = true;
        finalized = true;
 }
        
@@ -98,7 +107,7 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
                // 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, GL_FLOAT, BUFFER_OFFSET(0));
                check_error();
                glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                check_error();