From 301fba54452c01673bb9f105fbc3e68a704ad18a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 9 Jan 2012 08:11:33 -0700 Subject: [PATCH] mesa: rename _mesa_unpack_int_rgba_row() to _mesa_unpack_uint_rgba_row() Since it returns uint values, not int. Reviewed-by: Eric Anholt --- src/mesa/main/format_unpack.c | 4 ++-- src/mesa/main/format_unpack.h | 4 ++-- src/mesa/main/readpix.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c index a22ff5a616e..c723e896de7 100644 --- a/src/mesa/main/format_unpack.c +++ b/src/mesa/main/format_unpack.c @@ -1770,8 +1770,8 @@ unpack_int_rgba_ARGB2101010_UINT(const GLuint *src, GLuint dst[][4], GLuint n) } void -_mesa_unpack_int_rgba_row(gl_format format, GLuint n, - const void *src, GLuint dst[][4]) +_mesa_unpack_uint_rgba_row(gl_format format, GLuint n, + const void *src, GLuint dst[][4]) { switch (format) { /* Since there won't be any sign extension happening, there's no need to diff --git a/src/mesa/main/format_unpack.h b/src/mesa/main/format_unpack.h index c5348d30d48..bab29f6dd61 100644 --- a/src/mesa/main/format_unpack.h +++ b/src/mesa/main/format_unpack.h @@ -30,8 +30,8 @@ _mesa_unpack_rgba_row(gl_format format, GLuint n, void -_mesa_unpack_int_rgba_row(gl_format format, GLuint n, - const void *src, GLuint dst[][4]); +_mesa_unpack_uint_rgba_row(gl_format format, GLuint n, + const void *src, GLuint dst[][4]); extern void _mesa_unpack_rgba_block(gl_format format, diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 38b9c64ed9f..0c0e5394d66 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -273,7 +273,7 @@ slow_read_rgba_pixels( struct gl_context *ctx, for (j = 0; j < height; j++) { if (_mesa_is_integer_format(format)) { - _mesa_unpack_int_rgba_row(rbFormat, width, map, (GLuint (*)[4]) rgba); + _mesa_unpack_uint_rgba_row(rbFormat, width, map, (GLuint (*)[4]) rgba); _mesa_pack_rgba_span_int(ctx, width, (GLuint (*)[4]) rgba, format, type, dst); } else { -- 2.30.2