From: Kai Wasserbäch <kai@dev.carbon-project.org>
Date: Fri, 17 Aug 2018 14:32:31 +0000 (+0200)
Subject: util: mark s as MAYBE_UNUSED in _mesa_half_to_unorm8
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9387ca29ae465f5e1ee3b4a73c1f7725304bb30e;p=mesa.git

util: mark s as MAYBE_UNUSED in _mesa_half_to_unorm8

Only used, when asserts are enabled.

Fixes an unused-variable warning with gcc-8:
 ../../../src/util/half_float.c: In function '_mesa_half_to_unorm8':
 ../../../src/util/half_float.c:189:14: warning: unused variable 's' [-Wunused-variable]
     const int s = (val >> 15) & 0x1;
               ^

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/util/half_float.c b/src/util/half_float.c
index 2eff2c84f51..63aec5c5c14 100644
--- a/src/util/half_float.c
+++ b/src/util/half_float.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include "half_float.h"
 #include "rounding.h"
+#include "macros.h"
 
 typedef union { float f; int32_t i; uint32_t u; } fi_type;
 
@@ -186,7 +187,7 @@ uint8_t _mesa_half_to_unorm8(uint16_t val)
 {
    const int m = val & 0x3ff;
    const int e = (val >> 10) & 0x1f;
-   const int s = (val >> 15) & 0x1;
+   MAYBE_UNUSED const int s = (val >> 15) & 0x1;
 
    /* v = round_to_nearest(1.mmmmmmmmmm * 2^(e-15) * 255)
     *   = round_to_nearest((1.mmmmmmmmmm * 255) * 2^(e-15))