fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 15:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: fix wrong comparison in update_framebuffer_state()

Browse source 
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: eb0fd0e5f8 ("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>
This commit is contained in:
Samuel Pitoiset 2017-04-11 14:19:19 +02:00
parent a18bd1373b
commit b6b566b48e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/state_tracker/st_atom_framebuffer.c
View file

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