[Piglit] [PATCH 16/16] all.tests: make FBO tests concurrent
Marek Olšák
maraeo at gmail.com
Sun Nov 24 15:52:35 PST 2013
From: Marek Olšák <marek.olsak at amd.com>
---
tests/all.tests | 134 +++++++++++++++----------------
tests/fbo/fbo-1d.c | 1 +
tests/fbo/fbo-3d.c | 1 +
tests/fbo/fbo-alphatest-nocolor-ff.c | 1 +
tests/fbo/fbo-alphatest-nocolor.c | 1 +
tests/fbo/fbo-blit-stretch.cpp | 1 +
tests/fbo/fbo-clearmipmap.c | 1 +
tests/fbo/fbo-copyteximage-simple.c | 1 +
tests/fbo/fbo-copyteximage.c | 1 +
tests/fbo/fbo-cubemap.c | 1 +
tests/fbo/fbo-fragcoord.c | 1 +
tests/fbo/fbo-generatemipmap-nonsquare.c | 1 +
tests/fbo/fbo-generatemipmap-npot.c | 1 +
tests/fbo/fbo-generatemipmap-scissor.c | 1 +
tests/fbo/fbo-generatemipmap-viewport.c | 1 +
tests/fbo/fbo-generatemipmap.c | 1 +
tests/fbo/fbo-maxsize.c | 1 +
tests/fbo/fbo-readpixels-depth-formats.c | 1 +
tests/fbo/fbo-storage-completeness.c | 2 +
tests/texturing/getteximage-formats.c | 2 +
20 files changed, 88 insertions(+), 67 deletions(-)
diff --git a/tests/all.tests b/tests/all.tests
index 971ee33..c50fa35 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1160,8 +1160,8 @@ add_plain_test(arb_es2_compatibility, 'arb_es2_compatibility-shadercompiler')
add_plain_test(arb_es2_compatibility, 'arb_es2_compatibility-releaseshadercompiler')
add_plain_test(arb_es2_compatibility, 'arb_es2_compatibility-fixed-type')
add_plain_test(arb_es2_compatibility, 'fbo-missing-attachment-clear')
-arb_es2_compatibility['FBO blit to missing attachment (ES2 completeness rules)'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'es2', 'to'])
-arb_es2_compatibility['FBO blit from missing attachment (ES2 completeness rules)'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'es2', 'from'])
+arb_es2_compatibility['FBO blit to missing attachment (ES2 completeness rules)'] = concurrent_test('fbo-missing-attachment-blit es2 to')
+arb_es2_compatibility['FBO blit from missing attachment (ES2 completeness rules)'] = concurrent_test('fbo-missing-attachment-blit es2 from')
add_fbo_formats_tests('spec/ARB_ES2_compatibility', 'GL_ARB_ES2_compatibility')
add_texwrap_format_tests(arb_es2_compatibility, 'GL_ARB_ES2_compatibility')
arb_es2_compatibility['NUM_SHADER_BINARY_FORMATS over-run check'] = concurrent_test('arb_get_program_binary-overrun shader')
@@ -1274,31 +1274,31 @@ arb_framebuffer_object = Group()
spec['ARB_framebuffer_object'] = arb_framebuffer_object
add_concurrent_test(arb_framebuffer_object, 'same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT')
add_concurrent_test(arb_framebuffer_object, 'same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT')
-add_plain_test(arb_framebuffer_object, 'fdo28551')
+add_plain_test(arb_framebuffer_object, 'fdo28551') # must not be concurrent
for format in ('rgba', 'depth', 'stencil'):
for test_mode in ('draw', 'read'):
test_name = ' '.join(['framebuffer-blit-levels', test_mode, format])
- arb_framebuffer_object[test_name] = PlainExecTest(test_name + ' -auto')
-add_plain_test(arb_framebuffer_object, 'fbo-alpha')
+ arb_framebuffer_object[test_name] = concurrent_test(test_name)
+add_concurrent_test(arb_framebuffer_object, 'fbo-alpha')
add_plain_test(arb_framebuffer_object, 'fbo-blit-stretch')
-add_plain_test(arb_framebuffer_object, 'fbo-blit-scaled-linear')
-add_plain_test(arb_framebuffer_object, 'fbo-attachments-blit-scaled-linear')
-add_plain_test(arb_framebuffer_object, 'fbo-deriv')
-add_plain_test(arb_framebuffer_object, 'fbo-luminance-alpha')
-add_plain_test(arb_framebuffer_object, 'fbo-getframebufferattachmentparameter-01')
-add_plain_test(arb_framebuffer_object, 'fbo-gl_pointcoord')
-add_plain_test(arb_framebuffer_object, 'fbo-incomplete')
+add_concurrent_test(arb_framebuffer_object, 'fbo-blit-scaled-linear')
+add_concurrent_test(arb_framebuffer_object, 'fbo-attachments-blit-scaled-linear')
+add_concurrent_test(arb_framebuffer_object, 'fbo-deriv')
+add_concurrent_test(arb_framebuffer_object, 'fbo-luminance-alpha')
+add_concurrent_test(arb_framebuffer_object, 'fbo-getframebufferattachmentparameter-01')
+add_concurrent_test(arb_framebuffer_object, 'fbo-gl_pointcoord')
+add_concurrent_test(arb_framebuffer_object, 'fbo-incomplete')
add_concurrent_test(arb_framebuffer_object, 'fbo-incomplete-invalid-texture')
-add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-01')
-add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-02')
-add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-03')
-add_plain_test(arb_framebuffer_object, 'fbo-incomplete-texture-04')
+add_concurrent_test(arb_framebuffer_object, 'fbo-incomplete-texture-01')
+add_concurrent_test(arb_framebuffer_object, 'fbo-incomplete-texture-02')
+add_concurrent_test(arb_framebuffer_object, 'fbo-incomplete-texture-03')
+add_concurrent_test(arb_framebuffer_object, 'fbo-incomplete-texture-04')
add_concurrent_test(arb_framebuffer_object, 'fbo-mipmap-copypix')
-add_plain_test(arb_framebuffer_object, 'fbo-viewport')
-arb_framebuffer_object['FBO blit to missing attachment'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'to'])
-arb_framebuffer_object['FBO blit from missing attachment'] = PlainExecTest(['fbo-missing-attachment-blit', '-auto', 'from'])
-arb_framebuffer_object['fbo-scissor-blit fbo'] = PlainExecTest(['fbo-scissor-blit', 'fbo', '-auto'])
-arb_framebuffer_object['fbo-scissor-blit window'] = PlainExecTest(['fbo-scissor-blit', 'window', '-auto'])
+add_plain_test(arb_framebuffer_object, 'fbo-viewport') # must not be concurrent
+arb_framebuffer_object['FBO blit to missing attachment'] = concurrent_test('fbo-missing-attachment-blit to')
+arb_framebuffer_object['FBO blit from missing attachment'] = concurrent_test('fbo-missing-attachment-blit from')
+arb_framebuffer_object['fbo-scissor-blit fbo'] = concurrent_test('fbo-scissor-blit fbo')
+arb_framebuffer_object['fbo-scissor-blit window'] = plain_test('fbo-scissor-blit window')
arb_framebuffer_object['negative-readpixels-no-rb'] = concurrent_test('arb_framebuffer_object-negative-readpixels-no-rb')
# Group ARB_framebuffer_sRGB
@@ -1316,7 +1316,7 @@ for backing_type in ('texture', 'renderbuffer'):
blit_type, framebuffer_srgb_setting])
arb_framebuffer_srgb[test_name] = concurrent_test(
'arb_framebuffer_srgb-' + test_name)
-add_plain_test(arb_framebuffer_srgb, 'framebuffer-srgb')
+add_plain_test(arb_framebuffer_srgb, 'framebuffer-srgb') # must not be concurrent
arb_gpu_shader5 = Group()
spec['ARB_gpu_shader5'] = arb_gpu_shader5
@@ -1772,12 +1772,12 @@ add_plain_test(nv_vertex_program2_option, 'vp-clipdistance-04')
ext_framebuffer_blit = Group()
spec['EXT_framebuffer_blit'] = ext_framebuffer_blit
-add_plain_test(ext_framebuffer_blit, 'fbo-blit')
-add_plain_test(ext_framebuffer_blit, 'fbo-copypix')
-add_plain_test(ext_framebuffer_blit, 'fbo-readdrawpix')
-add_plain_test(ext_framebuffer_blit, 'fbo-srgb-blit')
-add_plain_test(ext_framebuffer_blit, 'fbo-sys-blit')
-add_plain_test(ext_framebuffer_blit, 'fbo-sys-sub-blit')
+add_plain_test(ext_framebuffer_blit, 'fbo-blit') # must not be concurrent
+add_plain_test(ext_framebuffer_blit, 'fbo-copypix') # must not be concurrent
+add_plain_test(ext_framebuffer_blit, 'fbo-readdrawpix') # must not be concurrent
+add_concurrent_test(ext_framebuffer_blit, 'fbo-srgb-blit')
+add_plain_test(ext_framebuffer_blit, 'fbo-sys-blit') # must not be concurrent
+add_plain_test(ext_framebuffer_blit, 'fbo-sys-sub-blit') # must not be concurrent
ext_framebuffer_multisample = Group()
spec['EXT_framebuffer_multisample'] = ext_framebuffer_multisample
@@ -1785,7 +1785,7 @@ ext_framebuffer_multisample['blit-mismatched-samples'] = concurrent_test('ext_fr
ext_framebuffer_multisample['blit-mismatched-sizes'] = concurrent_test('ext_framebuffer_multisample-blit-mismatched-sizes')
ext_framebuffer_multisample['blit-mismatched-formats'] = concurrent_test('ext_framebuffer_multisample-blit-mismatched-formats')
ext_framebuffer_multisample['dlist'] = concurrent_test('ext_framebuffer_multisample-dlist')
-ext_framebuffer_multisample['enable-flag'] = PlainExecTest('ext_framebuffer_multisample-enable-flag -auto')
+ext_framebuffer_multisample['enable-flag'] = concurrent_test('ext_framebuffer_multisample-enable-flag')
ext_framebuffer_multisample['minmax'] = concurrent_test('ext_framebuffer_multisample-minmax')
ext_framebuffer_multisample['negative-blit-scaled'] = concurrent_test('ext_framebuffer_multisample-negative-blit-scaled')
ext_framebuffer_multisample['negative-copypixels'] = concurrent_test('ext_framebuffer_multisample-negative-copypixels')
@@ -2022,48 +2022,48 @@ add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX4')
add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX8')
add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX16')
add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-noimage')
-add_plain_test(ext_framebuffer_object, 'fdo20701')
-add_plain_test(ext_framebuffer_object, 'fbo-1d')
-add_plain_test(ext_framebuffer_object, 'fbo-3d')
+add_concurrent_test(ext_framebuffer_object, 'fdo20701')
+add_concurrent_test(ext_framebuffer_object, 'fbo-1d')
+add_concurrent_test(ext_framebuffer_object, 'fbo-3d')
add_concurrent_test(ext_framebuffer_object, 'fbo-alphatest-formats')
-add_plain_test(ext_framebuffer_object, 'fbo-alphatest-nocolor')
-add_plain_test(ext_framebuffer_object, 'fbo-alphatest-nocolor-ff')
+add_concurrent_test(ext_framebuffer_object, 'fbo-alphatest-nocolor')
+add_concurrent_test(ext_framebuffer_object, 'fbo-alphatest-nocolor-ff')
add_concurrent_test(ext_framebuffer_object, 'fbo-blending-formats')
-add_plain_test(ext_framebuffer_object, 'fbo-bind-renderbuffer')
-add_plain_test(ext_framebuffer_object, 'fbo-clearmipmap')
+add_concurrent_test(ext_framebuffer_object, 'fbo-bind-renderbuffer')
+add_concurrent_test(ext_framebuffer_object, 'fbo-clearmipmap')
add_concurrent_test(ext_framebuffer_object, 'fbo-clear-formats')
-add_plain_test(ext_framebuffer_object, 'fbo-copyteximage')
-add_plain_test(ext_framebuffer_object, 'fbo-copyteximage-simple')
-add_plain_test(ext_framebuffer_object, 'fbo-cubemap')
-add_plain_test(ext_framebuffer_object, 'fbo-depthtex')
-add_plain_test(ext_framebuffer_object, 'fbo-depth-sample-compare')
-add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers')
-add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers masked-clear')
-add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-arbfp')
-add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-blend-add')
-add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-fragcolor')
-add_plain_test(ext_framebuffer_object, 'fbo-drawbuffers-maxtargets')
-add_plain_test(ext_framebuffer_object, 'fbo-finish-deleted')
-add_plain_test(ext_framebuffer_object, 'fbo-flushing')
-add_plain_test(ext_framebuffer_object, 'fbo-flushing-2')
-add_plain_test(ext_framebuffer_object, 'fbo-fragcoord')
-add_plain_test(ext_framebuffer_object, 'fbo-fragcoord2')
-add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap')
-add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-filtering')
+add_concurrent_test(ext_framebuffer_object, 'fbo-copyteximage')
+add_concurrent_test(ext_framebuffer_object, 'fbo-copyteximage-simple')
+add_concurrent_test(ext_framebuffer_object, 'fbo-cubemap')
+add_concurrent_test(ext_framebuffer_object, 'fbo-depthtex')
+add_concurrent_test(ext_framebuffer_object, 'fbo-depth-sample-compare')
+add_concurrent_test(ext_framebuffer_object, 'fbo-drawbuffers')
+add_concurrent_test(ext_framebuffer_object, 'fbo-drawbuffers masked-clear')
+add_concurrent_test(ext_framebuffer_object, 'fbo-drawbuffers-arbfp')
+add_concurrent_test(ext_framebuffer_object, 'fbo-drawbuffers-blend-add')
+add_concurrent_test(ext_framebuffer_object, 'fbo-drawbuffers-fragcolor')
+add_concurrent_test(ext_framebuffer_object, 'fbo-drawbuffers-maxtargets')
+add_concurrent_test(ext_framebuffer_object, 'fbo-finish-deleted')
+add_concurrent_test(ext_framebuffer_object, 'fbo-flushing')
+add_concurrent_test(ext_framebuffer_object, 'fbo-flushing-2')
+add_concurrent_test(ext_framebuffer_object, 'fbo-fragcoord')
+add_concurrent_test(ext_framebuffer_object, 'fbo-fragcoord2')
+add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap')
+add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-filtering')
add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-formats')
-add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-scissor')
-add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-nonsquare')
-add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-npot')
-add_plain_test(ext_framebuffer_object, 'fbo-generatemipmap-viewport')
-add_plain_test(ext_framebuffer_object, 'fbo-maxsize')
-add_plain_test(ext_framebuffer_object, 'fbo-nodepth-test')
-add_plain_test(ext_framebuffer_object, 'fbo-nostencil-test')
-add_plain_test(ext_framebuffer_object, 'fbo-readpixels')
-add_plain_test(ext_framebuffer_object, 'fbo-readpixels-depth-formats')
-add_plain_test(ext_framebuffer_object, 'fbo-scissor-bitmap')
-add_plain_test(ext_framebuffer_object, 'fbo-storage-completeness')
-add_plain_test(ext_framebuffer_object, 'fbo-storage-formats')
-add_plain_test(ext_framebuffer_object, 'getteximage-formats init-by-rendering')
+add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-scissor')
+add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-nonsquare')
+add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-npot')
+add_concurrent_test(ext_framebuffer_object, 'fbo-generatemipmap-viewport')
+add_concurrent_test(ext_framebuffer_object, 'fbo-maxsize')
+add_concurrent_test(ext_framebuffer_object, 'fbo-nodepth-test')
+add_concurrent_test(ext_framebuffer_object, 'fbo-nostencil-test')
+add_concurrent_test(ext_framebuffer_object, 'fbo-readpixels')
+add_concurrent_test(ext_framebuffer_object, 'fbo-readpixels-depth-formats')
+add_concurrent_test(ext_framebuffer_object, 'fbo-scissor-bitmap')
+add_concurrent_test(ext_framebuffer_object, 'fbo-storage-completeness')
+add_concurrent_test(ext_framebuffer_object, 'fbo-storage-formats')
+add_concurrent_test(ext_framebuffer_object, 'getteximage-formats init-by-rendering')
ext_image_dma_buf_import = Group()
spec['EXT_image_dma_buf_import'] = ext_image_dma_buf_import
diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c
index 0b3c84f..80da57f 100644
--- a/tests/fbo/fbo-1d.c
+++ b/tests/fbo/fbo-1d.c
@@ -87,6 +87,7 @@ create_1d_fbo(void)
piglit_draw_rect(BUF_WIDTH / 2, 0, BUF_WIDTH, 1);
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c
index 4cd117b..af0c0ae 100644
--- a/tests/fbo/fbo-3d.c
+++ b/tests/fbo/fbo-3d.c
@@ -108,6 +108,7 @@ create_3d_fbo(void)
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-alphatest-nocolor-ff.c b/tests/fbo/fbo-alphatest-nocolor-ff.c
index 0d137d7..e62d844 100644
--- a/tests/fbo/fbo-alphatest-nocolor-ff.c
+++ b/tests/fbo/fbo-alphatest-nocolor-ff.c
@@ -91,6 +91,7 @@ static void create_fbo(GLuint *out_tex)
piglit_draw_rect_z(1.0,
0.0, -1.0, 1.0, 2.0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glDisable(GL_ALPHA_TEST);
diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c
index 86c7f4d..452cca3 100644
--- a/tests/fbo/fbo-alphatest-nocolor.c
+++ b/tests/fbo/fbo-alphatest-nocolor.c
@@ -107,6 +107,7 @@ static void create_fbo(GLuint *out_tex)
piglit_draw_rect_z(1.0,
0.0, -1.0, 1.0, 2.0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glDisable(GL_ALPHA_TEST);
diff --git a/tests/fbo/fbo-blit-stretch.cpp b/tests/fbo/fbo-blit-stretch.cpp
index 319899c..1109783 100644
--- a/tests/fbo/fbo-blit-stretch.cpp
+++ b/tests/fbo/fbo-blit-stretch.cpp
@@ -377,6 +377,7 @@ run_test(const TestCase &test)
}
}
+ glBindFramebuffer(GL_FRAMEBUFFER, piglit_winsys_fbo);
glDeleteFramebuffers(1, &fbo);
glDeleteTextures(1, &tex);
diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c
index 086a454..acd03cb 100644
--- a/tests/fbo/fbo-clearmipmap.c
+++ b/tests/fbo/fbo-clearmipmap.c
@@ -107,6 +107,7 @@ piglit_init(int argc, char **argv)
assert(glGetError() == 0);
}
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glBindTexture(GL_TEXTURE_2D, tex);
}
diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c
index 90dab40..4cb36de 100644
--- a/tests/fbo/fbo-copyteximage-simple.c
+++ b/tests/fbo/fbo-copyteximage-simple.c
@@ -100,6 +100,7 @@ create_fbo(void)
glBindTexture(GL_TEXTURE_2D, copied_tex);
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, TEX_WIDTH, TEX_HEIGHT, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glDeleteTextures(1, &tex);
diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c
index abd8057..7ebbf34 100644
--- a/tests/fbo/fbo-copyteximage.c
+++ b/tests/fbo/fbo-copyteximage.c
@@ -102,6 +102,7 @@ create_fbo(void)
glBindTexture(GL_TEXTURE_2D, copied_tex);
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, draw_w, draw_h, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glDeleteTextures(1, &tex);
diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c
index 3bb7549..d96b880 100644
--- a/tests/fbo/fbo-cubemap.c
+++ b/tests/fbo/fbo-cubemap.c
@@ -120,6 +120,7 @@ create_cube_fbo(void)
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c
index 71c13a6..77a3c63 100644
--- a/tests/fbo/fbo-fragcoord.c
+++ b/tests/fbo/fbo-fragcoord.c
@@ -75,6 +75,7 @@ create_fbo(unsigned width, unsigned height, GLuint *out_tex)
" (0x%04x)\n",
internal_format, status);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glDeleteTextures(1, &tex);
piglit_report_result((status == GL_FRAMEBUFFER_UNSUPPORTED_EXT)
diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c
index 5b00001..755f5ff 100644
--- a/tests/fbo/fbo-generatemipmap-nonsquare.c
+++ b/tests/fbo/fbo-generatemipmap-nonsquare.c
@@ -103,6 +103,7 @@ create_fbo(void)
glGenerateMipmapEXT(GL_TEXTURE_2D);
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c
index 07b0d2f..938eba4 100644
--- a/tests/fbo/fbo-generatemipmap-npot.c
+++ b/tests/fbo/fbo-generatemipmap-npot.c
@@ -97,6 +97,7 @@ create_fbo(void)
glGenerateMipmapEXT(GL_TEXTURE_2D);
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c
index 8d78c1f..2d3797c 100644
--- a/tests/fbo/fbo-generatemipmap-scissor.c
+++ b/tests/fbo/fbo-generatemipmap-scissor.c
@@ -103,6 +103,7 @@ create_fbo(void)
glGenerateMipmapEXT(GL_TEXTURE_2D);
glDisable(GL_SCISSOR_TEST);
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c
index d46f6c9..7422947 100644
--- a/tests/fbo/fbo-generatemipmap-viewport.c
+++ b/tests/fbo/fbo-generatemipmap-viewport.c
@@ -102,6 +102,7 @@ create_fbo(void)
glGenerateMipmapEXT(GL_TEXTURE_2D);
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c
index df5ae98..6f4f46a 100644
--- a/tests/fbo/fbo-generatemipmap.c
+++ b/tests/fbo/fbo-generatemipmap.c
@@ -97,6 +97,7 @@ create_fbo(void)
glGenerateMipmapEXT(GL_TEXTURE_2D);
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c
index 8bab9c8..48cf945 100644
--- a/tests/fbo/fbo-maxsize.c
+++ b/tests/fbo/fbo-maxsize.c
@@ -153,6 +153,7 @@ static int create_fbo(void)
draw_color_sub_rect(x1, y1, maxsize);
draw_color_sub_rect(x0, y1, maxsize);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
return tex;
diff --git a/tests/fbo/fbo-readpixels-depth-formats.c b/tests/fbo/fbo-readpixels-depth-formats.c
index f43b1d4..d798f86 100644
--- a/tests/fbo/fbo-readpixels-depth-formats.c
+++ b/tests/fbo/fbo-readpixels-depth-formats.c
@@ -246,6 +246,7 @@ test_with_format(GLenum internal_format, const char *name)
}
done:
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fb);
glDeleteRenderbuffersEXT(1, &rb);
return pass;
diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c
index 3014796..0b4f52b 100644
--- a/tests/fbo/fbo-storage-completeness.c
+++ b/tests/fbo/fbo-storage-completeness.c
@@ -169,6 +169,7 @@ test(void)
incomplete = i;
}
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fbo);
glDeleteRenderbuffersEXT(1, &rb);
@@ -219,6 +220,7 @@ test(void)
return PIGLIT_FAIL;
}
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffersEXT(1, &fbo);
glDeleteRenderbuffersEXT(1, &rb);
diff --git a/tests/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c
index cbd67f0..32d9455 100644
--- a/tests/texturing/getteximage-formats.c
+++ b/tests/texturing/getteximage-formats.c
@@ -97,6 +97,7 @@ make_texture_image(GLenum intFormat, GLubyte upperRightTexel[4])
GL_TEXTURE_2D, texture_id, 0);
status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
if (status != GL_FRAMEBUFFER_COMPLETE) {
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffers(1, &fb);
return GL_FALSE;
}
@@ -107,6 +108,7 @@ make_texture_image(GLenum intFormat, GLubyte upperRightTexel[4])
glDrawPixels(TEX_SIZE, TEX_SIZE, GL_RGBA, GL_UNSIGNED_BYTE, tex);
glGenerateMipmap(GL_TEXTURE_2D);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, piglit_winsys_fbo);
glDeleteFramebuffers(1, &fb);
glViewport(0, 0, piglit_width, piglit_height);
}
--
1.8.3.2
More information about the Piglit
mailing list