[Piglit] [PATCH 2/3] enable -fbo for NV_conditional_render tests

[Chris Forbes]

---
 tests/all.tests                                    |   18 +++++++++---------
 tests/spec/nv_conditional_render/blitframebuffer.c |    2 +-
 tests/spec/nv_conditional_render/clear.c           |    2 +-
 tests/spec/nv_conditional_render/copypixels.c      |    2 +-
 tests/spec/nv_conditional_render/copyteximage.c    |    2 +-
 tests/spec/nv_conditional_render/copytexsubimage.c |    2 +-
 tests/spec/nv_conditional_render/dlist.c           |    2 +-
 tests/spec/nv_conditional_render/drawpixels.c      |    2 +-
 tests/spec/nv_conditional_render/generatemipmap.c  |    2 +-
 tests/spec/nv_conditional_render/vertex_array.c    |    2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index cf898d5..f67a4d0 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1674,15 +1674,15 @@ spec['NV_conditional_render'] = nv_conditional_render
 nv_conditional_render['begin-while-active'] = concurrent_test('nv_conditional_render-begin-while-active')
 nv_conditional_render['begin-zero'] = concurrent_test('nv_conditional_render-begin-zero')
 nv_conditional_render['bitmap'] = PlainExecTest(['nv_conditional_render-bitmap', '-auto'])
-nv_conditional_render['blitframebuffer'] = PlainExecTest(['nv_conditional_render-blitframebuffer', '-auto'])
-nv_conditional_render['clear'] = PlainExecTest(['nv_conditional_render-clear', '-auto'])
-nv_conditional_render['copypixels'] = PlainExecTest(['nv_conditional_render-copypixels', '-auto'])
-nv_conditional_render['copyteximage'] = PlainExecTest(['nv_conditional_render-copyteximage', '-auto'])
-nv_conditional_render['copytexsubimage'] = PlainExecTest(['nv_conditional_render-copytexsubimage', '-auto'])
-nv_conditional_render['dlist'] = PlainExecTest(['nv_conditional_render-dlist', '-auto'])
-nv_conditional_render['drawpixels'] = PlainExecTest(['nv_conditional_render-drawpixels', '-auto'])
-nv_conditional_render['generatemipmap'] = PlainExecTest(['nv_conditional_render-generatemipmap', '-auto'])
-nv_conditional_render['vertex_array'] = PlainExecTest(['nv_conditional_render-vertex_array', '-auto'])
+nv_conditional_render['blitframebuffer'] = concurrent_test('nv_conditional_render-blitframebuffer')
+nv_conditional_render['clear'] = concurrent_test('nv_conditional_render-clear')
+nv_conditional_render['copypixels'] = concurrent_test('nv_conditional_render-copypixels')
+nv_conditional_render['copyteximage'] = concurrent_test('nv_conditional_render-copyteximage')
+nv_conditional_render['copytexsubimage'] = concurrent_test('nv_conditional_render-copytexsubimage')
+nv_conditional_render['dlist'] = concurrent_test('nv_conditional_render-dlist')
+nv_conditional_render['drawpixels'] = concurrent_test('nv_conditional_render-drawpixels')
+nv_conditional_render['generatemipmap'] = concurrent_test('nv_conditional_render-generatemipmap')
+nv_conditional_render['vertex_array'] = concurrent_test('nv_conditional_render-vertex_array')
 
 oes_compressed_paletted_texture = Group()
 spec['OES_compressed_paletted_texture'] = oes_compressed_paletted_texture
diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c
index 61e72aa..d3a61da 100644
--- a/tests/spec/nv_conditional_render/blitframebuffer.c
+++ b/tests/spec/nv_conditional_render/blitframebuffer.c
@@ -120,7 +120,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c
index bec80f4..4c7c77f 100644
--- a/tests/spec/nv_conditional_render/clear.c
+++ b/tests/spec/nv_conditional_render/clear.c
@@ -81,7 +81,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c
index 348fd2a..36e26fd 100644
--- a/tests/spec/nv_conditional_render/copypixels.c
+++ b/tests/spec/nv_conditional_render/copypixels.c
@@ -83,7 +83,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &qfail);
 	glDeleteQueries(1, &qpass);
diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c
index 67234de..3110981 100644
--- a/tests/spec/nv_conditional_render/copyteximage.c
+++ b/tests/spec/nv_conditional_render/copyteximage.c
@@ -105,7 +105,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c
index 3ae84e7..476d867 100644
--- a/tests/spec/nv_conditional_render/copytexsubimage.c
+++ b/tests/spec/nv_conditional_render/copytexsubimage.c
@@ -105,7 +105,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c
index afc89e7..cb31ff7 100644
--- a/tests/spec/nv_conditional_render/dlist.c
+++ b/tests/spec/nv_conditional_render/dlist.c
@@ -76,7 +76,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c
index c65e65c..eb41457 100644
--- a/tests/spec/nv_conditional_render/drawpixels.c
+++ b/tests/spec/nv_conditional_render/drawpixels.c
@@ -97,7 +97,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 	free(buf);
diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c
index 7fb332f..5bacdc6 100644
--- a/tests/spec/nv_conditional_render/generatemipmap.c
+++ b/tests/spec/nv_conditional_render/generatemipmap.c
@@ -104,7 +104,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c
index c7ce6ea..2ab0a69 100644
--- a/tests/spec/nv_conditional_render/vertex_array.c
+++ b/tests/spec/nv_conditional_render/vertex_array.c
@@ -81,7 +81,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
-- 
1.7.10