i915g: Fix release build compiler warnings.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11852>
This commit is contained in:
Emma Anholt 2021-07-06 16:03:52 -07:00 committed by Marge Bot
parent 10d8e123c5
commit 3504bccb7c
2 changed files with 4 additions and 4 deletions

View file

@ -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)

View file

@ -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 */