X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=c8759744b9853229e24e1faf7a0f0f8321157758;hp=ea3a0110ce6e509da802e0d3d9a0eb9deaa1aaf2;hb=cef6dcbc9ebaceb7b0cb47d6a519cb08a390c358;hpb=8ea03db1932e4a76f457e0ecdfe31a4c8be0e0eb

diff --git a/test_util.cpp b/test_util.cpp
index ea3a011..c875974 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -55,11 +55,21 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
 		add_input(data, pixel_format, color_space, gamma_curve);
 	}
 
+	GLuint type;
+	if (framebuffer_format == GL_RGBA8) {
+		type = GL_UNSIGNED_BYTE;
+	} else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) {
+		type = GL_FLOAT;
+	} else {
+		// Add more here as needed.
+		assert(false);
+	}
+
 	glGenTextures(1, &texnum);
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, texnum);
 	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+	glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
 	check_error();
 
 	glGenFramebuffers(1, &fbo);
@@ -85,25 +95,39 @@ EffectChainTester::~EffectChainTester()
 	check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
 	ImageFormat format;
 	format.color_space = color_space;
 	format.gamma_curve = gamma_curve;
 
-	FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, width, height);
+	if (input_width == -1) {
+		input_width = width;
+	}
+	if (input_height == -1) {
+		input_height = height;
+	}
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, input_width, input_height);
 	input->set_pixel_data(data);
 	chain.add_input(input);
 	return input;
 }
 
-Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
 	ImageFormat format;
 	format.color_space = color_space;
 	format.gamma_curve = gamma_curve;
 
-	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height);
+	if (input_width == -1) {
+		input_width = width;
+	}
+	if (input_height == -1) {
+		input_height = height;
+	}
+
+	FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height);
 	input->set_pixel_data(data);
 	chain.add_input(input);
 	return input;
@@ -118,7 +142,20 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
 	chain.render_to_fbo(fbo, width, height);
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-	glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
+	check_error();
+	if (!epoxy_is_desktop_gl() && format == GL_RED) {
+		// GLES will only read GL_RGBA.
+		float *temp = new float[width * height * 4];
+		glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp);
+		check_error();
+		for (int i = 0; i < width * height; ++i) {
+			out_data[i] = temp[i * 4];
+		}
+		delete[] temp;
+	} else {
+		glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
+		check_error();
+	}
 
 	if (format == GL_RGBA) {
 		width *= 4;
@@ -136,7 +173,20 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 	chain.render_to_fbo(fbo, width, height);
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-	glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+	check_error();
+	if (!epoxy_is_desktop_gl() && format == GL_RED) {
+		// GLES will only read GL_RGBA.
+		unsigned char *temp = new unsigned char[width * height * 4];
+		glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, temp);
+		check_error();
+		for (int i = 0; i < width * height; ++i) {
+			out_data[i] = temp[i * 4];
+		}
+		delete[] temp;
+	} else {
+		glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+		check_error();
+	}
 
 	if (format == GL_RGBA) {
 		width *= 4;