X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=4728fb0805d26f1a7cb1814daf440a944755d7ad;hp=1820eafda24c56248fcaa80b3af73caa7172d507;hb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b;hpb=89da3437c862c15acb870fbe3175b9e4a0a8244a

diff --git a/flat_input.h b/flat_input.h
index 1820eaf..4728fb0 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
@@ -8,6 +15,7 @@
 class FlatInput : public Input {
 public:
 	FlatInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height);
+	~FlatInput();
 
 	virtual std::string effect_type_id() const { return "FlatInput"; }
 
@@ -16,10 +24,27 @@ 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));
+	}
+	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();
@@ -29,7 +54,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
@@ -71,4 +96,4 @@ private:
 	const void *pixel_data;
 };
 
-#endif // !defined(_FLAT_INPUT_H)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)