From e0b729c544ab0f25cd90af5daffdff0940743e14 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 2 Apr 2016 13:39:54 +0200 Subject: [PATCH] mesa/st: enable compute shaders if images are also supported MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: Also depend on atomic counters. Signed-off-by: Bas Nieuwenhuizen Reviewed-by: Marek Olšák Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_extensions.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 6d407d33eff..939f15d5e9f 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; } } } -- 2.11.0