diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /mesalib/src/gallium/auxiliary/util/u_format.c | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_format.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_format.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c index 730dc31ac..e07462a75 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.c +++ b/mesalib/src/gallium/auxiliary/util/u_format.c @@ -561,8 +561,8 @@ util_format_translate(enum pipe_format dst_format, tmp_z = MALLOC(width * sizeof *tmp_z); } - if (src_format_desc->unpack_s_8uscaled && - dst_format_desc->pack_s_8uscaled) { + if (src_format_desc->unpack_s_8uint && + dst_format_desc->pack_s_8uint) { tmp_s = MALLOC(width * sizeof *tmp_s); } @@ -573,8 +573,8 @@ util_format_translate(enum pipe_format dst_format, } if (tmp_s) { - src_format_desc->unpack_s_8uscaled(tmp_s, 0, src_row, src_stride, width, 1); - dst_format_desc->pack_s_8uscaled(dst_row, dst_stride, tmp_s, 0, width, 1); + src_format_desc->unpack_s_8uint(tmp_s, 0, src_row, src_stride, width, 1); + dst_format_desc->pack_s_8uint(dst_row, dst_stride, tmp_s, 0, width, 1); } dst_row += dst_step; |