Mesa (master): isl: fix warnings in release build

[Ian Romanick]

Module: Mesa
Branch: master
Commit: ff48375a164b8bd07882481c2f6caf3d8f1f5617
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff48375a164b8bd07882481c2f6caf3d8f1f5617

Author: Grazvydas Ignotas <notasas at gmail.com>
Date:   Sat Apr 16 04:00:14 2016 +0300

isl: fix warnings in release build

Mark variables MAYBE_UNUSED to avoid unused-but-set-variable warnings
in release build.

Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
Reviewed-by: Chad Versace <chad.versace at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/isl/isl.c      | 2 +-
 src/intel/isl/isl_gen7.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
index 0eaa808..6e492af 100644
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
@@ -695,7 +695,7 @@ isl_calc_phys_slice0_extent_sa_gen9_1d(
       const struct isl_extent4d *phys_level0_sa,
       struct isl_extent2d *phys_slice0_sa)
 {
-   const struct isl_format_layout *fmtl = isl_format_get_layout(info->format);
+   MAYBE_UNUSED const struct isl_format_layout *fmtl = isl_format_get_layout(info->format);
 
    assert(phys_level0_sa->height == 1);
    assert(phys_level0_sa->depth == 1);
diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
index 7064e85..542c137 100644
--- a/src/intel/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gen7.c
@@ -313,7 +313,7 @@ gen7_choose_valign_el(const struct isl_device *dev,
                       const struct isl_surf_init_info *restrict info,
                       enum isl_tiling tiling)
 {
-   bool require_valign2 = false;
+   MAYBE_UNUSED bool require_valign2 = false;
    bool require_valign4 = false;
 
    if (isl_format_is_compressed(info->format))