summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-17 08:27:52 -0600
committerBrian Paul <brianp@vmware.com>2009-08-17 08:28:22 -0600
commit7c4223876b4f8a78335687c7fcd7448b5a83ad10 (patch)
treefcf36ffb2ec3de695bc64d4ad543d1907da5ccfc
parentc952c1f109960a50aebf5a6d6bf3cf1e005e0729 (diff)
downloadexternal_mesa3d-7c4223876b4f8a78335687c7fcd7448b5a83ad10.zip
external_mesa3d-7c4223876b4f8a78335687c7fcd7448b5a83ad10.tar.gz
external_mesa3d-7c4223876b4f8a78335687c7fcd7448b5a83ad10.tar.bz2
cell: fix incorrect pipe_transfer tests
The value is an enum, not a bitmask.
-rw-r--r--src/gallium/drivers/cell/ppu/cell_texture.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/cell/ppu/cell_texture.c b/src/gallium/drivers/cell/ppu/cell_texture.c
index 80418f5..6a63a0e 100644
--- a/src/gallium/drivers/cell/ppu/cell_texture.c
+++ b/src/gallium/drivers/cell/ppu/cell_texture.c
@@ -417,7 +417,8 @@ cell_transfer_map(struct pipe_screen *screen, struct pipe_transfer *transfer)
if (!ctrans->map)
return NULL; /* out of memory */
- if (transfer->usage & PIPE_TRANSFER_READ) {
+ if (transfer->usage == PIPE_TRANSFER_READ ||
+ transfer->usage == PIPE_TRANSFER_READ_WRITE) {
/* need to untwiddle the texture to make a linear version */
const uint bpp = pf_get_size(ct->base.format);
if (bpp == 4) {
@@ -458,7 +459,8 @@ cell_transfer_unmap(struct pipe_screen *screen,
PIPE_BUFFER_USAGE_CPU_READ);
}
- if (transfer->usage & PIPE_TRANSFER_WRITE) {
+ if (transfer->usage == PIPE_TRANSFER_WRITE ||
+ transfer->usage == PIPE_TRANSFER_READ_WRITE) {
/* The user wrote new texture data into the mapped buffer.
* We need to convert the new linear data into the twiddled/tiled format.
*/