X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=4728fb0805d26f1a7cb1814daf440a944755d7ad;hp=3bcdc76d61a46a4555e7f8ab1b822ff101dc6efa;hb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b;hpb=f99ad333a7acbb6c8c995dbb036484ae8940c490

diff --git a/flat_input.h b/flat_input.h
index 3bcdc76..4728fb0 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,13 +1,21 @@
-#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
 // 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,15 +24,37 @@ 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 true; }
+	virtual bool can_output_linear_gamma() const {
+		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();
 
 	// 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);
 
-	ColorSpace get_color_space() const { return image_format.color_space; }
+	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; }
 
 	// Tells the input where to fetch the actual pixel data. Note that if you change
@@ -33,18 +63,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) {
@@ -52,19 +85,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)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)