diff options
| author | Topi Pohjolainen <topi.pohjolainen@intel.com> | 2016-05-24 15:58:17 +0300 |
|---|---|---|
| committer | Topi Pohjolainen <topi.pohjolainen@intel.com> | 2016-05-24 17:32:59 +0300 |
| commit | b71203748c90bbfbe1d04a42be40712581191fa1 (patch) | |
| tree | caba3dfef3ebd69831fa00ae26ff789012f58a40 | |
| parent | dc6d0bce0fe86c7dc5a844b0283ed30622bff499 (diff) | |
| -rw-r--r-- | tests/spec/ext_framebuffer_multisample/common.cpp | 8 | ||||
| -rw-r--r-- | tests/spec/ext_framebuffer_multisample/turn-on-off.cpp | 2 | ||||
| -rw-r--r-- | tests/util/piglit-test-pattern.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/tests/spec/ext_framebuffer_multisample/common.cpp b/tests/spec/ext_framebuffer_multisample/common.cpp index 735bcc548..ed151032a 100644 --- a/tests/spec/ext_framebuffer_multisample/common.cpp +++ b/tests/spec/ext_framebuffer_multisample/common.cpp @@ -410,8 +410,8 @@ Test::draw_test_image(Fbo *fbo) { int num_h_tiles = pattern_width / fbo->config.width; int num_v_tiles = pattern_height / fbo->config.height; - for (int h = 0; h < num_h_tiles; ++h) { - for (int v = 0; v < num_v_tiles; ++v) { + for (int h = 0; h < 1; ++h) { + for (int v = 0; v < 1; ++v) { glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo->handle); fbo->set_viewport(); @@ -459,8 +459,8 @@ Test::draw_reference_image() supersample_fbo.config.height / supersample_factor; int num_h_tiles = pattern_width / downsampled_width; int num_v_tiles = pattern_height / downsampled_height; - for (int h = 0; h < num_h_tiles; ++h) { - for (int v = 0; v < num_v_tiles; ++v) { + for (int h = 0; h < 1; ++h) { + for (int v = (num_v_tiles - 1); v < num_v_tiles; ++v) { glBindFramebuffer(GL_DRAW_FRAMEBUFFER, supersample_fbo.handle); supersample_fbo.set_viewport(); diff --git a/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp b/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp index 4c9c5046d..7b603b429 100644 --- a/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp +++ b/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp @@ -102,6 +102,7 @@ piglit_display(void) */ pass = test->measure_accuracy() && pass; +#if 0 /* Switch OFF MSAA again in this FBO */ test->test_fbo.set_samples(0); test->draw_test_image(&test->test_fbo); @@ -110,6 +111,7 @@ piglit_display(void) glBindFramebuffer(GL_READ_FRAMEBUFFER, test->test_fbo.handle); pass = piglit_probe_image_rgba(0, 0, w, h, color_buffer) && pass; +#endif if (!piglit_automatic) piglit_present_results(); diff --git a/tests/util/piglit-test-pattern.cpp b/tests/util/piglit-test-pattern.cpp index 12d991846..9d2a2da5b 100644 --- a/tests/util/piglit-test-pattern.cpp +++ b/tests/util/piglit-test-pattern.cpp @@ -131,12 +131,14 @@ void Triangles::compile() void Triangles::draw(const float (*proj)[4]) { +#if 0 glClear(GL_COLOR_BUFFER_BIT); +#endif glUseProgram(prog); glUniformMatrix4fv(proj_loc, 1, GL_TRUE, &proj[0][0]); glBindVertexArray(vao); - for (int tri_num = 0; tri_num < num_tris; ++tri_num) { + for (int tri_num = 0; tri_num < 1; ++tri_num) { glUniform1i(tri_num_loc, tri_num); glDrawArrays(GL_TRIANGLES, 0, 3); } |