X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=eb9fff34fe8184132d01121272e8f8a0fa6c0926;hp=b337788f4edaa328c1c5f1a00f2b6b4787ff6245;hb=17a469f38066d783158e02c983f24396c9fb4a92;hpb=9c6b86affb570a2e2d18c6da795c359da393f9a3

diff --git a/flat_input.h b/flat_input.h
index b337788..eb9fff3 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -22,9 +22,9 @@ public:
 	FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
 	~FlatInput();
 
-	virtual std::string effect_type_id() const { return "FlatInput"; }
+	std::string effect_type_id() const override { return "FlatInput"; }
 
-	virtual bool can_output_linear_gamma() const {
+	bool can_output_linear_gamma() const override {
 		// On desktop OpenGL, there's also GL_SLUMINANCE8 which could give us
 		// support for single-channel sRGB decoding, but it's not supported
 		// on GLES, and we're already actively rewriting single-channel inputs
@@ -35,7 +35,7 @@ public:
 		        (image_format.gamma_curve == GAMMA_LINEAR ||
 		         image_format.gamma_curve == GAMMA_sRGB));
 	}
-	virtual AlphaHandling alpha_handling() const {
+	AlphaHandling alpha_handling() const override {
 		switch (pixel_format) {
 		case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
 			return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
@@ -50,16 +50,16 @@ public:
 		}
 	}
 
-	std::string output_fragment_shader();
+	std::string output_fragment_shader() override;
 
 	// 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);
+	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) override;
 
-	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; }
-	virtual bool is_single_texture() const { return true; }
+	unsigned get_width() const override { return width; }
+	unsigned get_height() const override { return height; }
+	Colorspace get_color_space() const override { return image_format.color_space; }
+	GammaCurve get_gamma_curve() const override { return image_format.gamma_curve; }
+	bool is_single_texture() const override { return true; }
 
 	// 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
@@ -109,17 +109,20 @@ public:
 	// you will need to re-set it after this call.
 	void set_width(unsigned width)
 	{
+		assert(width != 0);
 		this->pitch = this->width = width;
 		invalidate_pixel_data();
 	}
 
 	void set_height(unsigned height)
 	{
+		assert(height != 0);
 		this->height = height;
 		invalidate_pixel_data();
 	}
 
 	void set_pitch(unsigned pitch) {
+		assert(pitch != 0);
 		this->pitch = pitch;
 		invalidate_pixel_data();
 	}
@@ -135,6 +138,10 @@ public:
 	// NOTE: The input does not take ownership of this texture; you are responsible
 	// for releasing it yourself. In particular, if you call invalidate_pixel_data()
 	// or anything calling it, the texture will silently be removed from the input.
+	//
+	// NOTE: Doing this in a situation where can_output_linear_gamma() is true
+	// can yield unexpected results, as the downstream effect can expect the texture
+	// to be uploaded with the sRGB flag on.
 	void set_texture_num(GLuint texture_num)
 	{
 		possibly_release_texture();
@@ -142,7 +149,7 @@ public:
 		this->owns_texture = false;
 	}
 
-	virtual void inform_added(EffectChain *chain)
+	void inform_added(EffectChain *chain) override
 	{
 		resource_pool = chain->get_resource_pool();
 	}