X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=9fcaf53138ccfe7bfece184fb5bf2e3f24e1e462;hp=a315735249dab4ea07ebca3997131db46d2101f0;hb=7f92cccbf86c655ab94bb4a33e80e6f4f7c415d7;hpb=f898f4106a13b1efdbad85037781f785c2064a76

diff --git a/flat_input.h b/flat_input.h
index a315735..9fcaf53 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,6 +1,13 @@
-#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 "effect.h"
+#include "image_format.h"
+#include "init.h"
 #include "input.h"
 
 // A FlatInput is the normal, “classic” case of an input, where everything
@@ -17,12 +24,28 @@ public:
 	// mipmap generation) at that point.
 	void finalize();
 
-	// TODO: Check that we actually have the required extension.
 	virtual bool can_output_linear_gamma() const {
-		return (type == GL_UNSIGNED_BYTE &&
+		return (movit_srgb_textures_supported &&
+		        type == GL_UNSIGNED_BYTE &&
 		        (image_format.gamma_curve == GAMMA_LINEAR ||
 		         image_format.gamma_curve == GAMMA_sRGB));
 	}
+	virtual AlphaHandling alpha_handling() const {
+		switch (pixel_format) {
+		case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
+		case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
+			return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
+		case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
+		case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
+			return OUTPUT_POSTMULTIPLIED_ALPHA;
+		case FORMAT_RGB:
+		case FORMAT_BGR:
+		case FORMAT_GRAYSCALE:
+			return OUTPUT_BLANK_ALPHA;
+		default:
+			assert(false);
+		}
+	}
 
 	std::string output_fragment_shader();
 
@@ -31,24 +54,32 @@ public:
 
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
-	ColorSpace get_color_space() const { return image_format.color_space; }
+	Colorspace get_color_space() const { return image_format.color_space; }
 	GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
 
 	// Tells the input where to fetch the actual pixel data. Note that if you change
 	// 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();
 	}
 
@@ -69,8 +100,8 @@ private:
 	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)