diff options
| author | Brian Paul <[email protected]> | 2010-01-25 14:46:17 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-25 14:46:17 -0700 |
| commit | 9b22427911ad27efc1f36faee9462c6082d0417c (patch) | |
| tree | 12e5a6c336e4ca2a71b754120dfcc183f09ae58c /src/gallium/auxiliary/util/u_tile.c | |
| parent | 7e7f8815fbfa21ab2397e673fa19c36603bc7a51 (diff) | |
| parent | 6749310d3f60df70ad8f82db986871ab9496793b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c
Diffstat (limited to 'src/gallium/auxiliary/util/u_tile.c')
| -rw-r--r-- | src/gallium/auxiliary/util/u_tile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_tile.c b/src/gallium/auxiliary/util/u_tile.c index f9936eb1cb2..c25e1e52e9d 100644 --- a/src/gallium/auxiliary/util/u_tile.c +++ b/src/gallium/auxiliary/util/u_tile.c @@ -390,7 +390,7 @@ a4r4g4b4_put_tile_rgba(ushort *dst, g >>= 4; b >>= 4; a >>= 4; - *dst++ = (a << 12) | (r << 16) | (g << 4) | b; + *dst++ = (a << 12) | (r << 8) | (g << 4) | b; } p += src_stride; } |