Module: Mesa Branch: arb_sync Commit: 4f02119988aa6a2119c351076ce05e2c96f8fc4d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f02119988aa6a2119c351076ce05e2c96f8fc4d
Author: Ian Romanick <[email protected]> Date: Tue Sep 1 11:24:54 2009 -0700 Use MIN2 instead of open-coded version Based on review comments by Brian Paul. --- src/mesa/main/syncobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c index 0471a0a..cbeda4b 100644 --- a/src/mesa/main/syncobj.c +++ b/src/mesa/main/syncobj.c @@ -59,6 +59,7 @@ #include "hash.h" #include "imports.h" #include "context.h" +#include "macros.h" #if FEATURE_ARB_sync #include "syncobj.h" @@ -408,7 +409,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, if (size > 0) { - const GLsizei copy_count = (size > bufSize) ? bufSize : size; + const GLsizei copy_count = MIN2(size, bufSize); _mesa_memcpy(values, v, sizeof(GLint) * copy_count); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
