diff options
author | Brian Paul <brianp@vmware.com> | 2009-07-28 08:58:25 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-07-28 08:58:25 -0600 |
commit | d2f6d6ce49699d35d6b6a234fe17a27d99f4b267 (patch) | |
tree | 22fcb97333ad7b6c57eb539c512a1dcc3d15a3aa /src/gallium/auxiliary/util | |
parent | 94726bc69e5f9dbefb34a38695f2f51d81ff433f (diff) | |
parent | bc60b884110b9e41ee3082075717587cc38380b5 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
Diffstat (limited to 'src/gallium/auxiliary/util')
-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 a0c8ed88f7..422bc76003 100644 --- a/src/gallium/auxiliary/util/u_tile.c +++ b/src/gallium/auxiliary/util/u_tile.c @@ -153,7 +153,7 @@ a8r8g8b8_put_tile_rgba(unsigned *dst, } -/*** PIPE_FORMAT_A8R8G8B8_UNORM ***/ +/*** PIPE_FORMAT_X8R8G8B8_UNORM ***/ static void x8r8g8b8_get_tile_rgba(const unsigned *src, |