summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-06-22 15:29:52 +0100
committerEric Engestrom <[email protected]>2019-07-31 09:41:05 +0100
commitc8a453a7706c3e85da6d1d0ded773c83ae93d51b (patch)
treec31c7c778c02f150d148bbe997590f370eadb483
parentd470f1acced6d865dde1b9b0029685c0fe656bce (diff)
v3d: replace MAYBE_UNUSED with UNUSED
MAYBE_UNUSED is going away, so let's replace legitimate uses of it with UNUSED, which the former aliased to so far anyway. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Matt Turner <[email protected]>
-rw-r--r--src/gallium/drivers/v3d/v3dx_rcl.c8
-rw-r--r--src/gallium/drivers/v3d/v3dx_state.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/v3d/v3dx_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c
index 8706ac0fc3f..e3ead90787f 100644
--- a/src/gallium/drivers/v3d/v3dx_rcl.c
+++ b/src/gallium/drivers/v3d/v3dx_rcl.c
@@ -269,9 +269,9 @@ static void
v3d_rcl_emit_stores(struct v3d_job *job, struct v3d_cl *cl)
{
#if V3D_VERSION < 40
- MAYBE_UNUSED bool needs_color_clear = job->clear & PIPE_CLEAR_COLOR_BUFFERS;
- MAYBE_UNUSED bool needs_z_clear = job->clear & PIPE_CLEAR_DEPTH;
- MAYBE_UNUSED bool needs_s_clear = job->clear & PIPE_CLEAR_STENCIL;
+ UNUSED bool needs_color_clear = job->clear & PIPE_CLEAR_COLOR_BUFFERS;
+ UNUSED bool needs_z_clear = job->clear & PIPE_CLEAR_DEPTH;
+ UNUSED bool needs_s_clear = job->clear & PIPE_CLEAR_STENCIL;
/* For clearing color in a TLB general on V3D 3.3:
*
@@ -562,7 +562,7 @@ v3dX(emit_rcl)(struct v3d_job *job)
struct v3d_surface *surf = v3d_surface(psurf);
struct v3d_resource *rsc = v3d_resource(psurf->texture);
- MAYBE_UNUSED uint32_t config_pad = 0;
+ UNUSED uint32_t config_pad = 0;
uint32_t clear_pad = 0;
/* XXX: Set the pad for raster. */
diff --git a/src/gallium/drivers/v3d/v3dx_state.c b/src/gallium/drivers/v3d/v3dx_state.c
index 1222768afdc..b6a57249044 100644
--- a/src/gallium/drivers/v3d/v3dx_state.c
+++ b/src/gallium/drivers/v3d/v3dx_state.c
@@ -708,7 +708,7 @@ static void *
v3d_create_sampler_state(struct pipe_context *pctx,
const struct pipe_sampler_state *cso)
{
- MAYBE_UNUSED struct v3d_context *v3d = v3d_context(pctx);
+ UNUSED struct v3d_context *v3d = v3d_context(pctx);
struct v3d_sampler_state *so = CALLOC_STRUCT(v3d_sampler_state);
if (!so)