X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=test_util.cpp;h=78122ced00d5f30190a5a9d7edabc97f2acd5260;hp=ed8b92a93990e974b0cb1d385d3eda952075614c;hb=7366e74b75fa1ac3267709c12417179819b86acb;hpb=240454ecb79e895dfebfab146174bd7458af4e42

diff --git a/test_util.cpp b/test_util.cpp
index ed8b92a..78122ce 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,
@@ -243,7 +248,7 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T
 		num_outputs = 1;
 	}
 
-	GLuint fbo, texnum[4];
+	GLuint texnum[4];
 
 	glGenTextures(num_outputs, texnum);
 	check_error();
@@ -254,24 +259,12 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T
 		check_error();
 	}
 
-	glGenFramebuffers(1, &fbo);
-	check_error();
-	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-	check_error();
+	vector<EffectChain::DestinationTexture> textures;
 	for (unsigned i = 0; i < num_outputs; ++i) {
-		glFramebufferTexture2D(
-			GL_FRAMEBUFFER,
-			GL_COLOR_ATTACHMENT0 + i,
-			GL_TEXTURE_2D,
-			texnum[i],
-			0);
-		check_error();
+		textures.push_back(EffectChain::DestinationTexture{texnum[i], framebuffer_format});
 	}
 
-	GLenum bufs[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2, GL_COLOR_ATTACHMENT3 };
-	glDrawBuffers(num_outputs, bufs);
-
-	chain.render_to_fbo(fbo, width, height);
+	chain.render_to_texture(textures, width, height);
 
 #ifdef HAVE_BENCHMARK
 	// If running benchmarks: Now we've warmed up everything, so let's run the
@@ -280,7 +273,7 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T
 		glFinish();
 	        size_t iters = benchmark_state->max_iterations;
 		for (auto _ : *benchmark_state) {
-			chain.render_to_fbo(fbo, width, height);
+			chain.render_to_texture(textures, width, height);
 			if (--iters == 0) {
 				glFinish();
 			}
@@ -291,15 +284,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 +308,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();
 		}
 
@@ -327,8 +319,6 @@ void EffectChainTester::internal_run(T *out_data, T *out_data2, T *out_data3, T
 		}
 	}
 
-	glDeleteFramebuffers(1, &fbo);
-	check_error();
 	glDeleteTextures(num_outputs, texnum);
 	check_error();
 }
@@ -512,4 +502,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