#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),
+ pbo(0),
+ texture_num(0),
needs_update(false),
finalized(false),
output_linear_gamma(false),
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);
}
+FlatInput::~FlatInput()
+{
+ if (pbo != 0) {
+ glDeleteBuffers(1, &pbo);
+ check_error();
+ }
+ if (texture_num != 0) {
+ glDeleteTextures(1, &texture_num);
+ check_error();
+ }
+}
+
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) {
} 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();
glBindTexture(GL_TEXTURE_2D, texture_num);
check_error();
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ 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);
+ 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;
}
// 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();