[Piglit] [PATCH 05/16] all.tests: make fbo-rg tests concurrent

[Marek Olšák]

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

---
 tests/all.tests    | 2 +-
 tests/fbo/fbo-rg.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index 6959ea7..cb5a6b2 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -204,7 +204,7 @@ def add_fbo_alphatest_extension(group, extension, name):
 
 def add_fbo_rg(group, format):
     name = "fbo-rg-" + format
-    group[name] = PlainExecTest(['fbo-rg', '-auto', format])
+    group[name] = concurrent_test('fbo-rg ' + format)
 
 security = Group()
 add_plain_test(security, 'initialized-texmemory')
diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c
index 63c67ba..fd20064 100644
--- a/tests/fbo/fbo-rg.c
+++ b/tests/fbo/fbo-rg.c
@@ -128,6 +128,7 @@ create_fbo(unsigned width, unsigned height, GLenum internal_format)
 				" (0x%04x)\n",
 				internal_format, status);
 
+		glBindFramebufferEXT(GL_FRAMEBUFFER, piglit_winsys_fbo);
 		glDeleteFramebuffersEXT(1, &fb);
 		glDeleteTextures(1, &tex);
 		piglit_report_result((status == GL_FRAMEBUFFER_UNSUPPORTED_EXT)
@@ -386,7 +387,7 @@ render_and_check_textures(GLenum internal_format)
 	glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_FLOAT, other_image);
 
 	glUseProgram(0);
-	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
 	glViewport(0, 0, piglit_width, piglit_height);
 
 	return compare_texture(rgba_image, other_image,
-- 
1.8.3.2