From 590734fa0d2c97035eae33278cce6065c98b880f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 7 Sep 2016 18:00:16 +0200 Subject: [PATCH] st/mesa: expose ARB_compute_variable_group_size MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This extension is only exposed if the underlying driver supports ARB_compute_shader and if PIPE_COMPUTE_MAX_VARIABLE_THREADS_PER_BLOCK is set. v3: - initialize max_variable_threads_per_block to 0 v2: - expose the ext based on that new cap Signed-off-by: Samuel Pitoiset Reviewed-by: Marek Olšák Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_extensions.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 2282dc7486e..b9befa1ac57 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -1196,6 +1196,28 @@ void st_init_extensions(struct pipe_screen *screen, extensions->ARB_compute_shader = extensions->ARB_shader_image_load_store && extensions->ARB_shader_atomic_counters; + + if (extensions->ARB_compute_shader) { + uint64_t max_variable_threads_per_block = 0; + + screen->get_compute_param(screen, PIPE_SHADER_IR_TGSI, + PIPE_COMPUTE_CAP_MAX_VARIABLE_THREADS_PER_BLOCK, + &max_variable_threads_per_block); + + for (i = 0; i < 3; i++) { + /* Clamp the values to avoid having a local work group size + * greater than the maximum number of invocations. + */ + consts->MaxComputeVariableGroupSize[i] = + MIN2(consts->MaxComputeWorkGroupSize[i], + max_variable_threads_per_block); + } + consts->MaxComputeVariableGroupInvocations = + max_variable_threads_per_block; + + extensions->ARB_compute_variable_group_size = + max_variable_threads_per_block > 0; + } } } -- 2.30.2