From da2a51129bfcb761d10a7a0b3c6579aa0adc5137 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Wed, 16 Nov 2016 10:39:04 +0100 Subject: [PATCH] st/mesa: silence warnings in optimized builds Mark variables and static functions that only occur in assert()s as MAYBE_UNUSED. Reviewed-by: Ilia Mirkin --- src/mesa/state_tracker/st_sampler_view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_sampler_view.c b/src/mesa/state_tracker/st_sampler_view.c index 2b2fa8b5376..88d5d1aae2f 100644 --- a/src/mesa/state_tracker/st_sampler_view.c +++ b/src/mesa/state_tracker/st_sampler_view.c @@ -317,7 +317,7 @@ get_texture_format_swizzle(const struct st_context *st, * * \param stObj the st texture object, */ -static boolean +MAYBE_UNUSED static boolean check_sampler_swizzle(const struct st_context *st, const struct st_texture_object *stObj, const struct pipe_sampler_view *sv, unsigned glsl_version) @@ -473,7 +473,7 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st, assert(gl_target_to_pipe(stObj->base.Target) == view->target); if (stObj->base.Target == GL_TEXTURE_BUFFER) { unsigned base = stObj->base.BufferOffset; - unsigned size = MIN2(stObj->pt->width0 - base, + MAYBE_UNUSED unsigned size = MIN2(stObj->pt->width0 - base, (unsigned) stObj->base.BufferSize); assert(view->u.buf.offset == base); assert(view->u.buf.size == size); -- 2.30.2