diff options
author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-07-10 07:37:43 +0200 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-07-13 19:27:17 +0000 |
commit | 20829d52e2e29bcdb0525a9ee0f92f9fc984e6f7 (patch) | |
tree | 580850fd873ed869b6cafe17b200684b662e5b61 | |
parent | 75313d5ab66fe9476d105ffe510b48a42d1e02ed (diff) |
tests: do not assert framebuffer-completeness
This causes the tests to show up as "crashed" here rather than failed,
which seems bad.
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/337>
-rw-r--r-- | tests/spec/arb_texture_multisample/sample-position.c | 4 | ||||
-rw-r--r-- | tests/spec/arb_texture_multisample/texelfetch.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/spec/arb_texture_multisample/sample-position.c b/tests/spec/arb_texture_multisample/sample-position.c index 89f7c1084..67d714a82 100644 --- a/tests/spec/arb_texture_multisample/sample-position.c +++ b/tests/spec/arb_texture_multisample/sample-position.c @@ -247,8 +247,8 @@ piglit_init(int argc, char **argv) glUseProgram(prog_rd); glUniform1i(glGetUniformLocation(prog_rd, "tex"), 0); - assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == - GL_FRAMEBUFFER_COMPLETE); + if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) + piglit_report_result(PIGLIT_FAIL); glViewport(0, 0, 1, 1); diff --git a/tests/spec/arb_texture_multisample/texelfetch.c b/tests/spec/arb_texture_multisample/texelfetch.c index 8dfe28bb5..c3c11856b 100644 --- a/tests/spec/arb_texture_multisample/texelfetch.c +++ b/tests/spec/arb_texture_multisample/texelfetch.c @@ -267,8 +267,8 @@ piglit_init(int argc, char **argv) tex, 0); glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); - assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == - GL_FRAMEBUFFER_COMPLETE); + if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) + piglit_report_result(PIGLIT_FAIL); /* create sample readback shader */ readback_prog = piglit_build_simple_program(vs_src_readback, |