This is the same fix as the previous patch.
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
---
tests/spec/arb_compute_shader/cs-ids-common.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tests/spec/arb_compute_shader/cs-ids-common.c
b/tests/spec/arb_compute_shader/cs-ids-common.c
index 4a0452d..80477fc 100644
--- a/tests/spec/arb_compute_shader/cs-ids-common.c
+++ b/tests/spec/arb_compute_shader/cs-ids-common.c
@@ -115,6 +115,7 @@ confirm_size()
uint32_t i, x, y, z;
uint32_t xs, ys, zs;
uint32_t hx, hy, hz;
+ bool pass = true;
xs = local_x;
ys = local_y;
@@ -172,26 +173,27 @@ confirm_size()
}
for (i = 0; i < NUM_ATOMIC_COUNTERS; i++) {
+ uint32_t found = p[i];
if (verbose)
printf("Atomic counter %d\n"
" Reference: %u\n"
" Observed: %u\n"
" Result: %s\n",
- i, values[i], p[i],
- values[i] == p[i] ? "pass" : "fail");
- if (values[i] != p[i]) {
+ i, values[i], found,
+ values[i] == found ? "pass" : "fail");
+ if (values[i] != found) {
printf("Atomic counter test %d failed for (%d, %d,
%d)\n",
i, xs, ys, zs);
printf(" Reference: %u\n", values[i]);
- printf(" Observed: %u\n", p[i]);
- glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
- return PIGLIT_FAIL;
+ printf(" Observed: %u\n", found);
+ pass = false;
+ break;
}
}
glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
- return PIGLIT_PASS;
+ return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
--
2.6.1
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
