aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium/auxiliary/util/u_format.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-17 13:18:21 +0200
committermarha <marha@users.sourceforge.net>2013-07-17 13:18:21 +0200
commitf5e157731e6b51421ac89cfefb666b8bbf971b03 (patch)
treea39529411c67f07761f016803733d1819b2c8e5a /mesalib/src/gallium/auxiliary/util/u_format.h
parent06f4de23ace4de1fd628c37891214f0a4ecb77db (diff)
downloadvcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.tar.gz
vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.tar.bz2
vcxsrv-f5e157731e6b51421ac89cfefb666b8bbf971b03.zip
mesa mkfontscale xserver git update 17 Jul 2013
xserver commit 74469895e39fa38337f59edd64c4031ab9bb51d8 mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 mesa commit b20e0fb5204ea85904e9f72f583e65bf35b446cb
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_format.h')
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_format.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index bb729c095..28527f532 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -361,13 +361,13 @@ struct util_format_description
* Only defined for INT formats.
*/
void
- (*unpack_rgba_uint)(unsigned *dst, unsigned dst_stride,
+ (*unpack_rgba_uint)(uint32_t *dst, unsigned dst_stride,
const uint8_t *src, unsigned src_stride,
unsigned width, unsigned height);
void
(*pack_rgba_uint)(uint8_t *dst, unsigned dst_stride,
- const unsigned *src, unsigned src_stride,
+ const uint32_t *src, unsigned src_stride,
unsigned width, unsigned height);
/**
@@ -377,13 +377,13 @@ struct util_format_description
* Only defined for INT formats.
*/
void
- (*unpack_rgba_sint)(signed *dst, unsigned dst_stride,
+ (*unpack_rgba_sint)(int32_t *dst, unsigned dst_stride,
const uint8_t *src, unsigned src_stride,
unsigned width, unsigned height);
void
(*pack_rgba_sint)(uint8_t *dst, unsigned dst_stride,
- const int *src, unsigned src_stride,
+ const int32_t *src, unsigned src_stride,
unsigned width, unsigned height);
/**