X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=a3ccb5c5f04cebcd3c804c294e95e93d7b886a59;hp=a5cd44cf251ed514697c79d567b15f037b620aa7;hb=61e2a7671f7b22227dcdc34dd303ae4fcc802aaa;hpb=3a36e34bd2b4e374bc501606ec28111eb3822334

diff --git a/test_util.cpp b/test_util.cpp
index a5cd44c..a3ccb5c 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_FLOAT, NULL);
+	glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
 	check_error();
 
 	glGenFramebuffers(1, &fbo);
@@ -133,13 +143,23 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	check_error();
-	if (!epoxy_is_desktop_gl() && format == GL_RED) {
+	if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) {
 		// 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];
+		if (format == GL_ALPHA) {
+			for (unsigned i = 0; i < width * height; ++i) {
+				out_data[i] = temp[i * 4 + 3];
+			}
+		} else if (format == GL_BLUE) {
+			for (unsigned i = 0; i < width * height; ++i) {
+				out_data[i] = temp[i * 4 + 2];
+			}
+		} else {
+			for (unsigned i = 0; i < width * height; ++i) {
+				out_data[i] = temp[i * 4];
+			}
 		}
 		delete[] temp;
 	} else {
@@ -164,13 +184,23 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
 	check_error();
-	if (!epoxy_is_desktop_gl() && format == GL_RED) {
+	if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) {
 		// 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];
+		if (format == GL_ALPHA) {
+			for (unsigned i = 0; i < width * height; ++i) {
+				out_data[i] = temp[i * 4 + 3];
+			}
+		} else if (format == GL_BLUE) {
+			for (unsigned i = 0; i < width * height; ++i) {
+				out_data[i] = temp[i * 4 + 2];
+			}
+		} else {
+			for (unsigned i = 0; i < width * height; ++i) {
+				out_data[i] = temp[i * 4];
+			}
 		}
 		delete[] temp;
 	} else {