From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 20 Mar 2014 20:46:32 +0000 (+0100)
Subject: Fix non-float framebuffers in EffectChainTester.
X-Git-Tag: 1.1~33
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=e039fbd29a207e849418f3820d1b456ce49bba50

Fix non-float framebuffers in EffectChainTester.

Again, GLES fix.
---

diff --git a/test_util.cpp b/test_util.cpp
index 27fac8f..a9f738d 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);