-#ifndef _FLAT_INPUT_H
-#define _FLAT_INPUT_H 1
+#ifndef _MOVIT_FLAT_INPUT_H
+#define _MOVIT_FLAT_INPUT_H 1
+#include <GL/glew.h>
#include <assert.h>
+#include <string>
-#include "input.h"
+#include "effect.h"
+#include "image_format.h"
#include "init.h"
+#include "input.h"
// A FlatInput is the normal, “classic” case of an input, where everything
// comes from a single 2D array with chunky pixels.
switch (pixel_format) {
case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
- return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED;
+ return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
- return OUTPUT_ALPHA_POSTMULTIPLIED;
+ return OUTPUT_POSTMULTIPLIED_ALPHA;
case FORMAT_RGB:
case FORMAT_BGR:
case FORMAT_GRAYSCALE:
// this data, you must either call set_pixel_data() again (using the same pointer
// is fine), or invalidate_pixel_data(). Otherwise, the texture won't be re-uploaded
// on subsequent frames.
- void set_pixel_data(const unsigned char *pixel_data)
+ //
+ // The data can either be a regular pointer (if pbo==0), or a byte offset
+ // into a PBO. The latter will allow you to start uploading the texture data
+ // asynchronously to the GPU, if you have any CPU-intensive work between the
+ // call to set_pixel_data() and the actual rendering. In either case,
+ // the pointer (and PBO, if set) has to be valid at the time of the render call.
+ void set_pixel_data(const unsigned char *pixel_data, GLuint pbo = 0)
{
assert(this->type == GL_UNSIGNED_BYTE);
this->pixel_data = pixel_data;
+ this->pbo = pbo;
invalidate_pixel_data();
}
- void set_pixel_data(const float *pixel_data)
+ void set_pixel_data(const float *pixel_data, GLuint pbo = 0)
{
assert(this->type == GL_FLOAT);
this->pixel_data = pixel_data;
+ this->pbo = pbo;
invalidate_pixel_data();
}
GLuint pbo, texture_num;
bool needs_update, finalized;
int output_linear_gamma, needs_mipmaps;
- unsigned width, height, pitch, bytes_per_pixel;
+ unsigned width, height, pitch;
const void *pixel_data;
};
-#endif // !defined(_FLAT_INPUT_H)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)