diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-17 13:20:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-17 13:20:49 +0200 |
| commit | 1e8e0fecef85725718befab85015da4575f570dc (patch) | |
| tree | b0338b4e7c765f9011b1d38820e2aaf9cb19ef04 /mesalib/src/gallium | |
| parent | 8a339365f243adb27ac9d417796a4338b1f8ddf6 (diff) | |
| parent | f5e157731e6b51421ac89cfefb666b8bbf971b03 (diff) | |
| download | vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.tar.gz vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.tar.bz2 vcxsrv-1e8e0fecef85725718befab85015da4575f570dc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa mkfontscale xserver git update 17 Jul 2013
Diffstat (limited to 'mesalib/src/gallium')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.c | 8 | ||||
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c index 686ca8a89..08ef6ab3e 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.c +++ b/mesalib/src/gallium/auxiliary/util/u_format.c @@ -297,7 +297,7 @@ util_format_read_4ui(enum pipe_format format, { const struct util_format_description *format_desc; const uint8_t *src_row; - unsigned *dst_row; + uint32_t *dst_row; format_desc = util_format_description(format); @@ -318,7 +318,7 @@ util_format_write_4ui(enum pipe_format format, { const struct util_format_description *format_desc; uint8_t *dst_row; - const unsigned *src_row; + const uint32_t *src_row; format_desc = util_format_description(format); @@ -339,7 +339,7 @@ util_format_read_4i(enum pipe_format format, { const struct util_format_description *format_desc; const uint8_t *src_row; - int *dst_row; + int32_t *dst_row; format_desc = util_format_description(format); @@ -360,7 +360,7 @@ util_format_write_4i(enum pipe_format format, { const struct util_format_description *format_desc; uint8_t *dst_row; - const int *src_row; + const int32_t *src_row; format_desc = util_format_description(format); 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); /** |