summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2017-09-26 11:45:30 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2017-10-18 13:47:26 +0200
commitf809eacff7f988568e01e6ce0928d312bff29d0b (patch)
treebe6d957a06ea1d542a83fe9d13671f255f851810
parentf6e1e7e2e4328f35138d137f156efc85d08c05c0 (diff)
shader_runner: don't use glMapNamedBufferRangeHEADmaster
We want to be able to run atomic counter tests even when the DSA entry points are unavailable (e.g. in GLES). Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--tests/shaders/shader_runner.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 625521cc0..a1e1597cc 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -2836,7 +2836,8 @@ probe_atomic_counter(unsigned buffer_num, GLint counter_num, const char *op, uin
REQUIRE(parse_comparison_op(op, &cmp, NULL),
"Invalid comparison operation at: %s\n", op);
- p = glMapNamedBufferRange(atomics_bos[buffer_num], counter_num * sizeof(uint32_t),
+ glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomics_bos[buffer_num]);
+ p = glMapBufferRange(GL_ATOMIC_COUNTER_BUFFER, counter_num * sizeof(uint32_t),
sizeof(uint32_t), GL_MAP_READ_BIT);
if (!p) {
@@ -2852,12 +2853,12 @@ probe_atomic_counter(unsigned buffer_num, GLint counter_num, const char *op, uin
counter_num, comparison_string(cmp));
printf(" Reference: %u\n", value);
printf(" Observed: %u\n", observed);
- glUnmapNamedBuffer(atomics_bos[buffer_num]);
+ glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
return false;
- }
+ }
- glUnmapNamedBuffer(atomics_bos[buffer_num]);
- return true;
+ glUnmapBuffer(GL_ATOMIC_COUNTER_BUFFER);
+ return true;
}
static bool