Mesa (main): i915g: Fix release build compiler warnings.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 3504bccb7c12d95d86ea3ce2d652721917e63c68
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3504bccb7c12d95d86ea3ce2d652721917e63c68

Author: Emma Anholt <emma at anholt.net>
Date:   Tue Jul  6 16:03:52 2021 -0700

i915g: Fix release build compiler warnings.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11852>

---

 src/gallium/drivers/i915/i915_debug.c   | 6 +++---
 src/gallium/drivers/i915/i915_surface.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_debug.c b/src/gallium/drivers/i915/i915_debug.c
index 11ba84076b6..fb258f0c857 100644
--- a/src/gallium/drivers/i915/i915_debug.c
+++ b/src/gallium/drivers/i915/i915_debug.c
@@ -245,9 +245,9 @@ BITS(struct debug_stream *stream, unsigned dw, unsigned hi, unsigned lo,
 
 #define MBZ(dw, hi, lo)                                                        \
    do {                                                                        \
-      unsigned x = (dw) >> (lo);                                               \
-      unsigned lomask = (1 << (lo)) - 1;                                       \
-      unsigned himask;                                                         \
+      ASSERTED unsigned x = (dw) >> (lo);                                      \
+      ASSERTED unsigned lomask = (1 << (lo)) - 1;                              \
+      ASSERTED unsigned himask;                                                \
       himask = (1UL << (hi)) - 1;                                              \
       assert((x & himask & ~lomask) == 0);                                     \
    } while (0)
diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
index 43723dd996a..8e446a8d0c2 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -208,7 +208,7 @@ i915_surface_copy_blitter(struct pipe_context *pipe, struct pipe_resource *dst,
    struct i915_texture *dst_tex = i915_texture(dst);
    struct i915_texture *src_tex = i915_texture(src);
    struct pipe_resource *dpt = &dst_tex->b;
-   struct pipe_resource *spt = &src_tex->b;
+   ASSERTED struct pipe_resource *spt = &src_tex->b;
    unsigned dst_offset, src_offset; /* in bytes */
 
    /* XXX cannot copy 3d regions at this time */