From d8b6a59896ac1b4e5d73f43a540433bb8a18b882 Mon Sep 17 00:00:00 2001 From: antonino Date: Wed, 7 Feb 2024 16:19:14 +0100 Subject: [PATCH] panfrost: rename `PAN_GPU_INDIRECTS` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antonino Maniscalco Reviewed-by: Boris Brezillon Reviewed-by: Louis-Francis Ratté-Boulianne Reviewed-by: Mary Guillemard Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 4 ++-- src/gallium/drivers/panfrost/pan_cmdstream.h | 2 +- src/gallium/drivers/panfrost/pan_jm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 9c9484068e4..29e11ab2ce0 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -3085,7 +3085,7 @@ panfrost_launch_grid_on_batch(struct pipe_context *pipe, panfrost_batch_write_rsrc(batch, buffer, PIPE_SHADER_COMPUTE); } - if (info->indirect && !PAN_GPU_INDIRECTS) { + if (info->indirect && !PAN_GPU_SUPPORTS_DISPATCH_INDIRECT) { struct pipe_transfer *transfer; uint32_t *params = pipe_buffer_map_range(pipe, info->indirect, info->indirect_offset, @@ -3850,7 +3850,7 @@ GENX(panfrost_cmdstream_screen_init)(struct panfrost_screen *screen) (&dev->blitter, panfrost_device_gpu_id(dev), &dev->blend_shaders, &screen->blitter.bin_pool.base, &screen->blitter.desc_pool.base); -#if PAN_GPU_INDIRECTS +#if PAN_GPU_SUPPORTS_DISPATCH_INDIRECT pan_indirect_dispatch_meta_init( &dev->indirect_dispatch, panfrost_device_gpu_id(dev), &screen->blitter.bin_pool.base, &screen->blitter.desc_pool.base); diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.h b/src/gallium/drivers/panfrost/pan_cmdstream.h index 2e2e84f49b1..608c503dfe1 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.h +++ b/src/gallium/drivers/panfrost/pan_cmdstream.h @@ -40,7 +40,7 @@ #include "util/u_prim.h" -#define PAN_GPU_INDIRECTS (PAN_ARCH == 7 || PAN_ARCH >= 10) +#define PAN_GPU_SUPPORTS_DISPATCH_INDIRECT (PAN_ARCH == 7 || PAN_ARCH >= 10) struct panfrost_rasterizer { struct pipe_rasterizer_state base; diff --git a/src/gallium/drivers/panfrost/pan_jm.c b/src/gallium/drivers/panfrost/pan_jm.c index e60abddcd8d..46155ff61e5 100644 --- a/src/gallium/drivers/panfrost/pan_jm.c +++ b/src/gallium/drivers/panfrost/pan_jm.c @@ -354,7 +354,7 @@ GENX(jm_launch_grid)(struct panfrost_batch *batch, #endif unsigned indirect_dep = 0; -#if PAN_GPU_INDIRECTS +#if PAN_GPU_SUPPORTS_DISPATCH_INDIRECT if (info->indirect) { struct panfrost_device *dev = pan_device(batch->ctx->base.screen); struct pan_indirect_dispatch_info indirect = {