Fix a case with non-float input textures.

[movit] / flat_input.cpp

diff --git a/flat_input.cpp b/flat_input.cpp
index 2541dc45af94c50383a8a89d9b1639dd1650b480..089008344c3f457468146203b84fbad5a638e527 100644 (file)
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -1,24 +1,24 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <string.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 #include <assert.h>
 
 #include "flat_input.h"
 #include "util.h"
+#include "opengl.h"
 
-FlatInput::FlatInput(ImageFormat image_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),
-         use_srgb_texture_format(false),
+         output_linear_gamma(false),
          needs_mipmaps(false),
          width(width),
          height(height),
          pitch(width)
 {
-       register_int("use_srgb_texture_format", &use_srgb_texture_format);
+       assert(type == GL_FLOAT || type == GL_UNSIGNED_BYTE);
+       register_int("output_linear_gamma", &output_linear_gamma);
        register_int("needs_mipmaps", &needs_mipmaps);
 }
 
@@ -26,29 +26,36 @@ void FlatInput::finalize()
 {
        // Translate the input format to OpenGL's enums.
        GLenum internal_format;
-       if (use_srgb_texture_format) {
+       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 (image_format.pixel_format == FORMAT_RGB) {
+       if (pixel_format == FORMAT_RGB) {
                format = GL_RGB;
                bytes_per_pixel = 3;
-       } else if (image_format.pixel_format == FORMAT_RGBA) {
+       } else if (pixel_format == FORMAT_RGBA) {
                format = GL_RGBA;
                bytes_per_pixel = 4;
-       } else if (image_format.pixel_format == FORMAT_BGR) {
+       } else if (pixel_format == FORMAT_BGR) {
                format = GL_BGR;
                bytes_per_pixel = 3;
-       } else if (image_format.pixel_format == FORMAT_BGRA) {
+       } else if (pixel_format == FORMAT_BGRA) {
                format = GL_BGRA;
                bytes_per_pixel = 4;
-       } else if (image_format.pixel_format == FORMAT_GRAYSCALE) {
+       } 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);
@@ -64,20 +71,20 @@ void FlatInput::finalize()
        check_error();
        glBindTexture(GL_TEXTURE_2D, texture_num);
        check_error();
-       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+       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);
+       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, 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;
 }
        
@@ -100,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, type, BUFFER_OFFSET(0));
                check_error();
                glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
                check_error();