Mesa (master): st/mesa: silence warnings in optimized builds
Nicolai Hähnle
nh at kemper.freedesktop.org
Fri Nov 18 08:55:05 UTC 2016
Module: Mesa
Branch: master
Commit: da2a51129bfcb761d10a7a0b3c6579aa0adc5137
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da2a51129bfcb761d10a7a0b3c6579aa0adc5137
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Wed Nov 16 10:39:04 2016 +0100
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 <imirkin at alum.mit.edu>
---
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 2b2fa8b..88d5d1a 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);
More information about the mesa-commit
mailing list