diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-04-11 14:19:19 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2017-04-13 10:06:06 +0200 |
| commit | b6b566b48e0240c1be9b3fd5ff1bb227a40f9260 (patch) | |
| tree | 6659c477d5b348a02d5cd74f95ee5b87239c453e /src | |
| parent | a18bd1373b1b7392e13a4b31a922488d2817d390 (diff) | |
st/mesa: fix wrong comparison in update_framebuffer_state()
state_tracker/st_atom_framebuffer.c:208:27: warning: comparison of constant 4294967295 with expression of type 'uint16_t' (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare]
if (framebuffer->width == UINT_MAX)
~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~
state_tracker/st_atom_framebuffer.c:210:28: warning: comparison of constant 4294967295 with expression of type 'uint16_t' (aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare]
if (framebuffer->height == UINT_MAX)
~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~
2 warnings generated.
Fixes: eb0fd0e5f86 ("gallium: decrease the size of pipe_framebuffer_state - 96 -> 80 bytes")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_framebuffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c index ea41d9dcd7..7435c00a4f 100644 --- a/src/mesa/state_tracker/st_atom_framebuffer.c +++ b/src/mesa/state_tracker/st_atom_framebuffer.c @@ -59,8 +59,8 @@ update_framebuffer_size(struct pipe_framebuffer_state *framebuffer, struct pipe_surface *surface) { assert(surface); - assert(surface->width < UINT_MAX); - assert(surface->height < UINT_MAX); + assert(surface->width < USHRT_MAX); + assert(surface->height < USHRT_MAX); framebuffer->width = MIN2(framebuffer->width, surface->width); framebuffer->height = MIN2(framebuffer->height, surface->height); } @@ -205,9 +205,9 @@ update_framebuffer_state( struct st_context *st ) } #endif - if (framebuffer->width == UINT_MAX) + if (framebuffer->width == USHRT_MAX) framebuffer->width = 0; - if (framebuffer->height == UINT_MAX) + if (framebuffer->height == USHRT_MAX) framebuffer->height = 0; cso_set_framebuffer(st->cso_context, framebuffer); |