diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2020-01-21 13:55:44 +0200 |
|---|---|---|
| committer | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2020-02-06 22:14:38 +0000 |
| commit | beaad641552ccc0ecdd0bfb118fc7db4c968895c (patch) | |
| tree | 4b4fce153d2055dcc876b0e4fbcbf71468696d04 | |
| parent | ac1cd149cecf11af28209e51730fb791772a7806 (diff) | |
intel_blackhole_render: drop asserts in favor of error reporting
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
| -rw-r--r-- | tests/spec/intel_blackhole_render/blackhole_dispatch.c | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/tests/spec/intel_blackhole_render/blackhole_dispatch.c b/tests/spec/intel_blackhole_render/blackhole_dispatch.c index 222358afa..a06ec8e24 100644 --- a/tests/spec/intel_blackhole_render/blackhole_dispatch.c +++ b/tests/spec/intel_blackhole_render/blackhole_dispatch.c @@ -64,7 +64,6 @@ piglit_display(void) void piglit_init(int argc, char **argv) { - enum piglit_result result = PIGLIT_PASS; GLuint data_bo = 0; GLfloat *data_buf; GLint ok = 1; @@ -92,7 +91,10 @@ piglit_init(int argc, char **argv) glCompileShader(shader); glGetShaderiv(shader, GL_COMPILE_STATUS, &ok); - assert(ok); + if (!ok) { + piglit_report_result(PIGLIT_SKIP); + return; + } prog = glCreateProgram(); @@ -101,11 +103,17 @@ piglit_init(int argc, char **argv) glLinkProgram(prog); glGetProgramiv(prog, GL_LINK_STATUS, &ok); - assert(ok); + if (!ok) { + piglit_report_result(PIGLIT_SKIP); + return; + } glUseProgram(prog); - assert(!glIsEnabled(GL_BLACKHOLE_RENDER_INTEL)); + if (glIsEnabled(GL_BLACKHOLE_RENDER_INTEL)) { + piglit_report_result(PIGLIT_FAIL); + return; + } glMemoryBarrier(GL_ALL_BARRIER_BITS); glUniform1f(glGetUniformLocation(prog, "value"), 1.0f); @@ -113,11 +121,16 @@ piglit_init(int argc, char **argv) glMemoryBarrier(GL_ALL_BARRIER_BITS); if (!piglit_probe_buffer(data_bo, GL_SHADER_STORAGE_BUFFER, "output_values", - SIZE_X, 1, &one)) - result = PIGLIT_FAIL; + SIZE_X, 1, &one)) { + piglit_report_result(PIGLIT_FAIL); + return; + } glEnable(GL_BLACKHOLE_RENDER_INTEL); - assert(glIsEnabled(GL_BLACKHOLE_RENDER_INTEL)); + if (!glIsEnabled(GL_BLACKHOLE_RENDER_INTEL)) { + piglit_report_result(PIGLIT_FAIL); + return; + } glMemoryBarrier(GL_ALL_BARRIER_BITS); glUniform1f(glGetUniformLocation(prog, "value"), 2.0f); @@ -125,8 +138,10 @@ piglit_init(int argc, char **argv) glMemoryBarrier(GL_ALL_BARRIER_BITS); if (!piglit_probe_buffer(data_bo, GL_SHADER_STORAGE_BUFFER, "output_values", - SIZE_X, 1, &one)) - result = PIGLIT_FAIL; + SIZE_X, 1, &one)) { + piglit_report_result(PIGLIT_FAIL); + return; + } - piglit_report_result(result); + piglit_report_result(PIGLIT_PASS); } |