diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2013-11-24 14:06:35 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2013-12-02 22:27:57 +0100 |
| commit | 000011b4514b0b1ea9738a7470e613a8b83ee1da (patch) | |
| tree | 56a435334dca668e28844bcfaabca6c1944affe2 | |
| parent | c5ed74d0aa44de0e9e1e1d5abd344b927a552b2d (diff) | |
all.tests: make fbo-depthstencil tests concurrent
Tested-by: Dylan Baker <baker.dylan.c@gmail.com>
| -rw-r--r-- | tests/all.tests | 24 | ||||
| -rw-r--r-- | tests/fbo/fbo-depthstencil.c | 1 |
2 files changed, 14 insertions, 11 deletions
diff --git a/tests/all.tests b/tests/all.tests index dc7f64cfb..84f41d7d7 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -73,23 +73,25 @@ MSAA_SAMPLE_COUNTS = (2, 4, 6, 8, 16, 32) def add_fbo_depthstencil_tests(group, format, num_samples): if format == 'default_fb': prefix = '' + create_test = plain_test else: prefix = 'fbo-' + create_test = concurrent_test if num_samples > 1: suffix = ' samples=' + str(num_samples) - psamples = ['-samples=' + str(num_samples)] + psamples = ' -samples=' + str(num_samples) else: suffix = '' - psamples = [] - group[prefix + 'depthstencil-' + format + '-clear' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'clear', format] + psamples) - group[prefix + 'depthstencil-' + format + '-readpixels-FLOAT-and-USHORT' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'readpixels', format, 'FLOAT-and-USHORT'] + psamples) - group[prefix + 'depthstencil-' + format + '-readpixels-24_8' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'readpixels', format, '24_8'] + psamples) - group[prefix + 'depthstencil-' + format + '-readpixels-32F_24_8_REV' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'readpixels', format, '32F_24_8_REV'] + psamples) - group[prefix + 'depthstencil-' + format + '-drawpixels-FLOAT-and-USHORT' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'drawpixels', format, 'FLOAT-and-USHORT'] + psamples) - group[prefix + 'depthstencil-' + format + '-drawpixels-24_8' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'drawpixels', format, '24_8'] + psamples) - group[prefix + 'depthstencil-' + format + '-drawpixels-32F_24_8_REV' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'drawpixels', format, '32F_24_8_REV'] + psamples) - group[prefix + 'depthstencil-' + format + '-copypixels' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'copypixels', format] + psamples) - group[prefix + 'depthstencil-' + format + '-blit' + suffix] = PlainExecTest(['fbo-depthstencil', '-auto', 'blit', format] + psamples) + psamples = '' + group[prefix + 'depthstencil-' + format + '-clear' + suffix] = create_test('fbo-depthstencil clear ' + format + psamples) + group[prefix + 'depthstencil-' + format + '-readpixels-FLOAT-and-USHORT' + suffix] = create_test('fbo-depthstencil readpixels ' + format + ' FLOAT-and-USHORT' + psamples) + group[prefix + 'depthstencil-' + format + '-readpixels-24_8' + suffix] = create_test('fbo-depthstencil readpixels ' + format + ' 24_8' + psamples) + group[prefix + 'depthstencil-' + format + '-readpixels-32F_24_8_REV' + suffix] = create_test('fbo-depthstencil readpixels ' + format + ' 32F_24_8_REV' + psamples) + group[prefix + 'depthstencil-' + format + '-drawpixels-FLOAT-and-USHORT' + suffix] = create_test('fbo-depthstencil drawpixels ' + format + ' FLOAT-and-USHORT' + psamples) + group[prefix + 'depthstencil-' + format + '-drawpixels-24_8' + suffix] = create_test('fbo-depthstencil drawpixels ' + format + ' 24_8' + psamples) + group[prefix + 'depthstencil-' + format + '-drawpixels-32F_24_8_REV' + suffix] = create_test('fbo-depthstencil drawpixels ' + format + ' 32F_24_8_REV' + psamples) + group[prefix + 'depthstencil-' + format + '-copypixels' + suffix] = create_test('fbo-depthstencil copypixels ' + format + psamples) + group[prefix + 'depthstencil-' + format + '-blit' + suffix] = create_test('fbo-depthstencil blit ' + format + psamples) def add_fbo_depthstencil_msaa_visual_tests(group, format): add_fbo_depthstencil_tests(group, format, 0) diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c index f23114a27..e4a8e0095 100644 --- a/tests/fbo/fbo-depthstencil.c +++ b/tests/fbo/fbo-depthstencil.c @@ -472,6 +472,7 @@ enum piglit_result piglit_display(void) /* Cleanup. */ if (f.iformat) { + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo); glDeleteFramebuffersEXT(1, &fb); glDeleteRenderbuffersEXT(1, &rb); } |