From 2deea42ebaac9cd43007d2a881e9f5ac5512799d Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sun, 20 Apr 2025 15:58:49 +0200 Subject: [PATCH] gallium: remove pipe_compute_caps::max_block_size_clover MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Mike Blumenkrantz Reviewed-by: Marek Olšák Reviewed-by: Alyssa Rosenzweig Reviewed-by: Mary Guillemard Reviewed-by: Jose Maria Casanova Crespo Part-of: --- docs/gallium/screen.rst | 2 -- src/gallium/drivers/r600/r600_pipe.c | 4 ---- src/gallium/include/pipe/p_defines.h | 1 - 3 files changed, 7 deletions(-) diff --git a/docs/gallium/screen.rst b/docs/gallium/screen.rst index fb954d783a7..d32be01b227 100644 --- a/docs/gallium/screen.rst +++ b/docs/gallium/screen.rst @@ -760,8 +760,6 @@ pipe_screen::get_compute_param. units. * ``pipe_compute_caps.max_block_size``: Maximum block size in thread units. -* ``pipe_compute_caps.max_block_size_clover``: Same as ``pipe_compute_caps.max_block_size`` - but used by clover only. * ``pipe_compute_caps.max_threads_per_block``: Maximum number of threads that a single block can contain. This may be less than the product of the components of MAX_BLOCK_SIZE and is diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 3fa007fdab7..1b9e0de3325 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -307,10 +307,6 @@ static void r600_init_compute_caps(struct r600_screen *screen) caps->max_block_size[1] = caps->max_block_size[2] = rscreen->gfx_level >= EVERGREEN ? 1024 : 256; - caps->max_block_size_clover[0] = - caps->max_block_size_clover[1] = - caps->max_block_size_clover[2] = 256; - caps->max_threads_per_block = rscreen->gfx_level >= EVERGREEN ? 1024 : 256; caps->max_threads_per_block_clover = 256; caps->address_bits = 32; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 68f74d46c9b..13b8be58191 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -795,7 +795,6 @@ struct pipe_compute_caps { unsigned grid_dimension; unsigned max_grid_size[3]; unsigned max_block_size[3]; - unsigned max_block_size_clover[3]; unsigned max_threads_per_block; unsigned max_threads_per_block_clover; unsigned max_local_size;