diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2016-02-13 18:01:27 -0800 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2016-04-16 15:16:51 -0700 |
| commit | 97cdfac23d456158538b92df599a6832bb8fc20a (patch) | |
| tree | acb9e30d6f06a47419a9632eb9579d3babc93ad9 | |
| parent | fdc92e4c8c48a808898644e8b2a9ae760423f2a7 (diff) | |
arb_shader_image_load_store/common: Use reserved image unit for CS result readback.
| -rw-r--r-- | tests/spec/arb_shader_image_load_store/common.c | 5 | ||||
| -rw-r--r-- | tests/spec/arb_shader_image_load_store/grid.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/spec/arb_shader_image_load_store/common.c b/tests/spec/arb_shader_image_load_store/common.c index f5a387aeb..cbeaac71e 100644 --- a/tests/spec/arb_shader_image_load_store/common.c +++ b/tests/spec/arb_shader_image_load_store/common.c @@ -587,7 +587,7 @@ init_fb(const struct grid_info grid) uint32_t *pixels = malloc(n * sizeof(*pixels)); ret = init_pixels(img, pixels, 0.5, 0.5, 0.5, 0.5) && - upload_image(img, 7, pixels); + upload_image(img, max_image_units(), pixels); free(pixels); } else { @@ -609,7 +609,8 @@ download_result(const struct grid_info grid, uint32_t *r_pixels) if (grid.stages & GL_COMPUTE_SHADER_BIT) { /* No actual framebuffer. Results are returned into * an image. */ - return download_image(image_info_for_grid(grid), 7, r_pixels); + return download_image(image_info_for_grid(grid), + max_image_units(), r_pixels); } else { glReadPixels(0, 0, grid.size.x, grid.size.y, diff --git a/tests/spec/arb_shader_image_load_store/grid.c b/tests/spec/arb_shader_image_load_store/grid.c index 8ef743aab..4b24c2c55 100644 --- a/tests/spec/arb_shader_image_load_store/grid.c +++ b/tests/spec/arb_shader_image_load_store/grid.c @@ -345,7 +345,7 @@ draw_grid(const struct grid_info grid, GLuint prog) } if (grid.stages & GL_COMPUTE_SHADER_BIT) { - set_uniform_int(prog, "ret_img", 7); + set_uniform_int(prog, "ret_img", max_image_units()); glDispatchCompute(1, grid.size.y, 1); } else if (grid.stages & (GL_TESS_CONTROL_SHADER_BIT | |