From e7f88c41c46a5b0e45d426132aaf44cf403cc862 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 7 Feb 2023 12:05:32 -0800 Subject: [PATCH] freedreno: Quiet unused variable warnings Signed-off-by: Rob Clark Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 2 +- src/gallium/drivers/freedreno/freedreno_context.c | 2 +- src/gallium/drivers/freedreno/freedreno_resource.c | 2 +- src/gallium/drivers/freedreno/freedreno_resource.h | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c index 234e6d292e0..38d3f837eb2 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c @@ -91,7 +91,7 @@ emit_mrt(struct fd_ringbuffer *ring, struct pipe_framebuffer_state *pfb, enum a3xx_color_swap swap = WZYX; bool sint = false, uint = false; struct fd_resource *rsc = NULL; - struct fdl_slice *slice = NULL; + ASSERTED struct fdl_slice *slice = NULL; uint32_t stride = 0; uint32_t array_stride = 0; uint32_t offset; diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c index 747925afb62..78500b24e64 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.c +++ b/src/gallium/drivers/freedreno/freedreno_context.c @@ -487,7 +487,7 @@ fd_get_reset_count(struct fd_context *ctx, bool per_context) { uint64_t val; enum fd_param_id param = per_context ? FD_CTX_FAULTS : FD_GLOBAL_FAULTS; - int ret = fd_pipe_get_param(ctx->pipe, param, &val); + ASSERTED int ret = fd_pipe_get_param(ctx->pipe, param, &val); assert(!ret); return val; } diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c index 10ddb84e840..f5d20b16280 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.c +++ b/src/gallium/drivers/freedreno/freedreno_resource.c @@ -569,7 +569,7 @@ fd_resource_uncompress(struct fd_context *ctx, struct fd_resource *rsc, bool lin uint64_t modifier = linear ? DRM_FORMAT_MOD_LINEAR : FD_FORMAT_MOD_QCOM_TILED; - bool success = fd_try_shadow_resource(ctx, rsc, 0, NULL, modifier); + ASSERTED bool success = fd_try_shadow_resource(ctx, rsc, 0, NULL, modifier); /* shadow should not fail in any cases where we need to uncompress: */ assert(success); diff --git a/src/gallium/drivers/freedreno/freedreno_resource.h b/src/gallium/drivers/freedreno/freedreno_resource.h index d4829627433..d076de046e0 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.h +++ b/src/gallium/drivers/freedreno/freedreno_resource.h @@ -314,8 +314,7 @@ fd_resource_ubwc_offset(struct fd_resource *rsc, unsigned level, unsigned layer) static inline bool fd_resource_level_linear(const struct pipe_resource *prsc, int level) { - struct fd_screen *screen = fd_screen(prsc->screen); - assert(!is_a3xx(screen)); + assert(!is_a3xx(fd_screen(prsc->screen))); return fdl_level_linear(&fd_resource_const(prsc)->layout, level); }