X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=90c038678f2e429fd775c3770510a0bf4605a9b3;hp=69c1a6f14d00b2b5a64205133aad3853d23a31eb;hb=07e256b26e5ac82c282478a1bd3289d61cac5461;hpb=9dcbd93164611ea111cc29519c18193d4f571ac1

diff --git a/flat_input.h b/flat_input.h
index 69c1a6f..90c0386 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -7,7 +7,9 @@
 // comes from a single 2D array with chunky pixels.
 class FlatInput : public Input {
 public:
-	FlatInput(ImageFormat format, unsigned width, unsigned height);
+	FlatInput(ImageFormat format, MovitPixelFormat pixel_format, unsigned width, unsigned height);
+
+	virtual std::string effect_type_id() const { return "FlatInput"; }
 
 	// Create the texture itself. We cannot do this in the constructor,
 	// because we don't necessarily know all the settings (sRGB texture,
@@ -15,13 +17,18 @@ public:
 	void finalize();
 
 	// TODO: Check that we actually have the required extension.
-	virtual bool can_output_linear_gamma() const { return true; }
+	virtual bool can_output_linear_gamma() const {
+		return (image_format.gamma_curve == GAMMA_LINEAR ||
+		        image_format.gamma_curve == GAMMA_sRGB);
+	}
 
 	std::string output_fragment_shader();
 
 	// Uploads the texture if it has changed since last time.
 	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num);
 
+	unsigned get_width() const { return width; }
+	unsigned get_height() const { return height; }
 	ColorSpace get_color_space() const { return image_format.color_space; }
 	GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
 
@@ -56,6 +63,7 @@ public:
 
 private:
 	ImageFormat image_format;
+	MovitPixelFormat pixel_format;
 	GLenum format;
 	GLuint pbo, texture_num;
 	bool needs_update, finalized;