---
tests/spec/arb_shader_image_load_store/common.c | 5 +++--
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 f5a387a..cbeaac7 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 8ef743a..4b24c2c 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 |
--
2.7.0
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
