X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=8b5a3ce4c07d004368063634014b9c88087cd3fc;hp=90c038678f2e429fd775c3770510a0bf4605a9b3;hb=38fca90c6ffde05e3459c7021e823cef0b3b27ac;hpb=4a9b478d0cc333e7b47a766d3d27ffe67c08f15a

diff --git a/flat_input.h b/flat_input.h
index 90c0386..8b5a3ce 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -2,12 +2,14 @@
 #define _FLAT_INPUT_H 1
 
 #include "input.h"
+#include "init.h"
 
 // A FlatInput is the normal, “classic” case of an input, where everything
 // comes from a single 2D array with chunky pixels.
 class FlatInput : public Input {
 public:
-	FlatInput(ImageFormat format, MovitPixelFormat pixel_format, unsigned width, unsigned height);
+	FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
+	~FlatInput();
 
 	virtual std::string effect_type_id() const { return "FlatInput"; }
 
@@ -16,10 +18,11 @@ 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 (image_format.gamma_curve == GAMMA_LINEAR ||
-		        image_format.gamma_curve == GAMMA_sRGB);
+		return (movit_srgb_textures_supported &&
+		        type == GL_UNSIGNED_BYTE &&
+		        (image_format.gamma_curve == GAMMA_LINEAR ||
+		         image_format.gamma_curve == GAMMA_sRGB));
 	}
 
 	std::string output_fragment_shader();
@@ -29,7 +32,7 @@ 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
@@ -38,18 +41,21 @@ public:
 	// on subsequent frames.
 	void set_pixel_data(const unsigned char *pixel_data)
 	{
+		assert(this->type == GL_UNSIGNED_BYTE);
 		this->pixel_data = pixel_data;
 		invalidate_pixel_data();
 	}
 
-	void invalidate_pixel_data()
+	void set_pixel_data(const float *pixel_data)
 	{
-		needs_update = true;
+		assert(this->type == GL_FLOAT);
+		this->pixel_data = pixel_data;
+		invalidate_pixel_data();
 	}
 
-	const unsigned char *get_pixel_data() const
+	void invalidate_pixel_data()
 	{
-		return pixel_data;
+		needs_update = true;
 	}
 
 	void set_pitch(unsigned pitch) {
@@ -57,19 +63,15 @@ public:
 		this->pitch = pitch;
 	}
 
-	unsigned get_pitch() {
-		return pitch;
-	}
-
 private:
 	ImageFormat image_format;
 	MovitPixelFormat pixel_format;
-	GLenum format;
+	GLenum format, type;
 	GLuint pbo, texture_num;
 	bool needs_update, finalized;
 	int output_linear_gamma, needs_mipmaps;
 	unsigned width, height, pitch, bytes_per_pixel;
-	const unsigned char *pixel_data;
+	const void *pixel_data;
 };
 
 #endif // !defined(_FLAT_INPUT_H)