diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:47:15 +0200 |
| commit | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (patch) | |
| tree | 24d79f7eaee4d69dde46cf88aa7314a4fceebbe5 /mesalib/src/mesa/state_tracker/st_atom_constbuf.c | |
| parent | 2fe2056807d1304de86deb2b59992d51d9252ad0 (diff) | |
| download | vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.gz vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.tar.bz2 vcxsrv-ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c.zip | |
fontconfig mesa git update 28 June 2013
fontconfig commit 197d06c49b01413303f2c92130594daa4fcaa6ad
mesa commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_constbuf.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_constbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c index 27a910b5f..723ab561c 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_constbuf.c +++ b/mesalib/src/mesa/state_tracker/st_atom_constbuf.c @@ -205,7 +205,7 @@ static void st_bind_ubos(struct st_context *st, * Take the minimum just to be sure. */ if (!binding->AutomaticSize) - cb.buffer_size = MIN2(cb.buffer_size, binding->Size); + cb.buffer_size = MIN2(cb.buffer_size, (unsigned) binding->Size); } else { cb.buffer_offset = 0; |