#include <string.h>
#include <assert.h>
+#include <GL/glew.h>
+#include "effect_util.h"
#include "flat_input.h"
#include "util.h"
-#include "opengl.h"
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),
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);
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.
internal_format = GL_RGBA16F_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) {
check_error();
glBindTexture(GL_TEXTURE_2D, texture_num);
check_error();
+ 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);
// 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_FLOAT, 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();