summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2016-04-02 13:39:54 +0200
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2016-04-19 18:10:32 +0200
commite0b729c544ab0f25cd90af5daffdff0940743e14 (patch)
tree31989fdc5fa11a46fc9c2c424934c6408cbf7e73
parent41d79bcbfa64f6f72b0090e12838073983ea6e5b (diff)
downloadmesa-e0b729c544ab0f25cd90af5daffdff0940743e14.tar.gz
mesa-e0b729c544ab0f25cd90af5daffdff0940743e14.tar.xz
mesa/st: enable compute shaders if images are also supported
v2: Also depend on atomic counters. Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
-rw-r--r--src/mesa/state_tracker/st_extensions.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 6d407d3..939f15d 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1168,9 +1168,10 @@ void st_init_extensions(struct pipe_screen *screen,
consts->MaxComputeWorkGroupCount[i] = grid_size[i];
consts->MaxComputeWorkGroupSize[i] = block_size[i];
}
- /* XXX: ARB_compute_shader is not enabled by default because images
- * support is still not implemented yet. */
- /* extensions->ARB_compute_shader = true; */
+
+ extensions->ARB_compute_shader =
+ extensions->ARB_shader_image_load_store &&
+ extensions->ARB_shader_atomic_counters;
}
}
}