[Piglit] [PATCH 06/16] all.tests: make multisample-formats tests concurrent

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 tests/all.tests                                   | 5 ++---
 tests/spec/ext_framebuffer_multisample/common.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index cb5a6b2..4ff7f29 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -185,9 +185,8 @@ def add_msaa_formats_tests(group, extension):
     for num_samples in MSAA_SAMPLE_COUNTS:
         args = [str(num_samples), extension]
         test_name = ' '.join(['multisample-formats'] + args)
-        group[test_name] = PlainExecTest(
-                ['ext_framebuffer_multisample-formats', '-auto']
-                + args)
+        group[test_name] = concurrent_test(
+                'ext_framebuffer_multisample-formats ' + ' '.join(args))
 
 def add_fbo_generatemipmap_extension(group, extension, name):
     group[name] = concurrent_test('fbo-generatemipmap-formats ' + extension)
diff --git a/tests/spec/ext_framebuffer_multisample/common.cpp b/tests/spec/ext_framebuffer_multisample/common.cpp
index 09585e7..8bd4e4c 100644
--- a/tests/spec/ext_framebuffer_multisample/common.cpp
+++ b/tests/spec/ext_framebuffer_multisample/common.cpp
@@ -352,7 +352,7 @@ void
 Test::show(Fbo *src_fbo, int x_offset, int y_offset)
 {
 	glBindFramebuffer(GL_READ_FRAMEBUFFER, src_fbo->handle);
-	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
 	glViewport(0, 0, piglit_width, piglit_height);
 	glBlitFramebuffer(0, 0, src_fbo->config.width, src_fbo->config.height,
 			  x_offset, y_offset,
@@ -438,7 +438,7 @@ Test::draw_test_image(Fbo *fbo)
 void
 Test::draw_to_default_framebuffer()
 {
-	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
 	glViewport(0, 0, pattern_width, pattern_height);
 	draw_pattern(0, 0, pattern_width, pattern_height);
 }
@@ -487,8 +487,8 @@ Test::measure_accuracy()
 {
 	bool pass = true;
 
-	glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
-			glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+	glBindFramebuffer(GL_READ_FRAMEBUFFER, piglit_winsys_fbo);
+			glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo);
 			glViewport(0, 0, piglit_width, piglit_height);
 
 	float *reference_data = new float[pattern_width * pattern_height * 4];
-- 
1.8.3.2