X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test_util.cpp;h=096c07a426eb21018b7e9b73d97a4a8e7f8aca97;hb=5278bd9c038dd9f2d56b4de52c904426dfe0b6fe;hp=1a69b0ca0fb28b5023f2c5785ac82b87e3e7d8fb;hpb=f34b1c36acd27944f00885edfc55363432bfec8e;p=movit

diff --git a/test_util.cpp b/test_util.cpp
index 1a69b0c..096c07a 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -42,6 +42,11 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 	}
 }
 
+void init_movit_for_test()
+{
+       CHECK(init_movit(".", MOVIT_DEBUG_OFF));
+}
+
 }  // namespace
 
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
@@ -105,12 +110,12 @@ Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat
 
 void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<float>(out_data, nullptr, NULL, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
+	internal_run<float>(out_data, nullptr, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
 }
 
 void EffectChainTester::run(float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<float>(out_data, out_data2, nullptr, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
+	internal_run<float>(out_data, out_data2, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format);
 }
 
 void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
@@ -125,12 +130,12 @@ void EffectChainTester::run(float *out_data, float *out_data2, float *out_data3,
 
 void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<unsigned char>(out_data, nullptr, NULL, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
+	internal_run<unsigned char>(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
 }
 
 void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<unsigned char>(out_data, out_data2, nullptr, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
+	internal_run<unsigned char>(out_data, out_data2, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format);
 }
 
 void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
@@ -145,24 +150,24 @@ void EffectChainTester::run(unsigned char *out_data, unsigned char *out_data2, u
 
 void EffectChainTester::run(uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<uint16_t>(out_data, nullptr, NULL, NULL, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format);
+	internal_run<uint16_t>(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format);
 }
 
 void EffectChainTester::run_10_10_10_2(uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<uint32_t>(out_data, nullptr, NULL, NULL, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format);
+	internal_run<uint32_t>(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format);
 }
 
 #ifdef HAVE_BENCHMARK
 
 void EffectChainTester::benchmark(benchmark::State &state, float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<float>(out_data, nullptr, NULL, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
+	internal_run<float>(out_data, nullptr, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
 }
 
 void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<float>(out_data, out_data2, nullptr, NULL, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
+	internal_run<float>(out_data, out_data2, nullptr, nullptr, GL_FLOAT, format, color_space, gamma_curve, alpha_format, &state);
 }
 
 void EffectChainTester::benchmark(benchmark::State &state, float *out_data, float *out_data2, float *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
@@ -177,12 +182,12 @@ void EffectChainTester::benchmark(benchmark::State &state, float *out_data, floa
 
 void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<unsigned char>(out_data, nullptr, NULL, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
+	internal_run<unsigned char>(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
 }
 
 void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<unsigned char>(out_data, out_data2, nullptr, NULL, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
+	internal_run<unsigned char>(out_data, out_data2, nullptr, nullptr, GL_UNSIGNED_BYTE, format, color_space, gamma_curve, alpha_format, &state);
 }
 
 void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_data, unsigned char *out_data2, unsigned char *out_data3, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
@@ -197,12 +202,12 @@ void EffectChainTester::benchmark(benchmark::State &state, unsigned char *out_da
 
 void EffectChainTester::benchmark(benchmark::State &state, uint16_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<uint16_t>(out_data, nullptr, NULL, NULL, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format, &state);
+	internal_run<uint16_t>(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_SHORT, format, color_space, gamma_curve, alpha_format, &state);
 }
 
 void EffectChainTester::benchmark_10_10_10_2(benchmark::State &state, uint32_t *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve, OutputAlphaFormat alpha_format)
 {
-	internal_run<uint32_t>(out_data, nullptr, NULL, NULL, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format, &state);
+	internal_run<uint32_t>(out_data, nullptr, nullptr, nullptr, GL_UNSIGNED_INT_2_10_10_10_REV, format, color_space, gamma_curve, alpha_format, &state);
 }
 
 #endif
@@ -291,15 +296,14 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T
 
 	T *data[4] = { out_data, out_data2, out_data3, out_data4 };
 
-	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-	check_error();
 	for (unsigned i = 0; i < num_outputs; ++i) {
 		T *ptr = data[i];
-		glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
+		glBindTexture(GL_TEXTURE_2D, texnum[i]);
+		check_error();
 		if (!epoxy_is_desktop_gl() && (format == GL_RED || format == GL_BLUE || format == GL_ALPHA)) {
 			// GLES will only read GL_RGBA.
 			T *temp = new T[width * height * 4];
-			glReadPixels(0, 0, width, height, GL_RGBA, internal_format, temp);
+			glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, type, temp);
 			check_error();
 			if (format == GL_ALPHA) {
 				for (unsigned i = 0; i < width * height; ++i) {
@@ -316,7 +320,7 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T
 			}
 			delete[] temp;
 		} else {
-			glReadPixels(0, 0, width, height, format, internal_format, ptr);
+			glGetTexImage(GL_TEXTURE_2D, 0, format, type, ptr);
 			check_error();
 		}
 
@@ -385,7 +389,7 @@ void expect_equal(const float *ref, const float *result, unsigned width, unsigne
 	float rms = sqrt(squared_difference) / (width * height);
 	EXPECT_LT(rms, rms_limit);
 
-	if (largest_difference >= largest_difference_limit || rms >= rms_limit) {
+	if (largest_difference >= largest_difference_limit || isnan(rms) || rms >= rms_limit) {
 		fprintf(stderr, "Dumping matrices for easier debugging, since at least one test failed.\n");
 
 		fprintf(stderr, "Reference:\n");
@@ -512,4 +516,47 @@ double linear_to_srgb(double x)
 	}
 }
 
+DisableComputeShadersTemporarily::DisableComputeShadersTemporarily(bool disable_compute_shaders)
+	: disable_compute_shaders(disable_compute_shaders)
+{
+	init_movit_for_test();
+	saved_compute_shaders_supported = movit_compute_shaders_supported;
+	if (disable_compute_shaders) {
+		movit_compute_shaders_supported = false;
+	}
+}
+
+DisableComputeShadersTemporarily::~DisableComputeShadersTemporarily()
+{
+	movit_compute_shaders_supported = saved_compute_shaders_supported;
+}
+
+bool DisableComputeShadersTemporarily::should_skip()
+{
+	if (disable_compute_shaders) {
+		return false;
+	}
+
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Compute shaders not supported; skipping.\n");
+		return true;
+	}
+	return false;
+}
+
+#ifdef HAVE_BENCHMARK
+bool DisableComputeShadersTemporarily::should_skip(benchmark::State *benchmark_state)
+{
+	if (disable_compute_shaders) {
+		return false;
+	}
+
+	if (!movit_compute_shaders_supported) {
+		benchmark_state->SkipWithError("Compute shaders not supported");
+		return true;
+	}
+	return false;
+}
+#endif
+
 }  // namespace movit