KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/aux/util/u_surface.c: Silence warnings and remove unneeded MAYBE_UNUSED 

* Explicitely convert values to int in comparison.
 * Remove one MAYBE_UNUSED that is actually not needed.

Signed-off-by: Gert Wollny <gw.fossdev@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Gert Wollny 2017-11-16 16:10:01 +01:00 committed by Brian Paul
parent c7bf83ef5c
commit b50eda8498
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/auxiliary/util/u_surface.c
View File

@ -259,7 +259,7 @@ util_resource_copy_region(struct pipe_context *pipe,
struct pipe_transfer *src_trans, *dst_trans;
uint8_t *dst_map;
const uint8_t *src_map;
MAYBE_UNUSED enum pipe_format src_format;
enum pipe_format src_format;
enum pipe_format dst_format;
struct pipe_box src_box, dst_box;
unsigned src_bs, dst_bs, src_bw, dst_bw, src_bh, dst_bh;
@ -328,10 +328,10 @@ util_resource_copy_region(struct pipe_context *pipe,
assert(dst_box.y % dst_bh == 0);
/* check that region boxes are not out of bounds */
assert(src_box.x + src_box.width <= u_minify(src->width0, src_level));
assert(src_box.y + src_box.height <= u_minify(src->height0, src_level));
assert(dst_box.x + dst_box.width <= u_minify(dst->width0, dst_level));
assert(dst_box.y + dst_box.height <= u_minify(dst->height0, dst_level));
assert(src_box.x + src_box.width <= (int)u_minify(src->width0, src_level));
assert(src_box.y + src_box.height <= (int)u_minify(src->height0, src_level));
assert(dst_box.x + dst_box.width <= (int)u_minify(dst->width0, dst_level));
assert(dst_box.y + dst_box.height <= (int)u_minify(dst->height0, dst_level));
/* check that total number of src, dest bytes match */
assert((src_box.width / src_bw) * (src_box.height / src_bh) * src_bs ==