diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-10-02 18:13:26 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-10-02 18:13:26 +0200 |
| commit | 47e41b024e325f69ed514e551a6824afa58f1db6 (patch) | |
| tree | 5b98f65f5d67e2a1a450ad681bc64bf229a198d2 /src/gallium/drivers/r300/r300_screen.c | |
| parent | 7d4b348c67dbc2eff1d7dd0c043a76bc0eae57ab (diff) | |
gallium: Preparations for adding more PIPE_TRANSFER_* usage flags.
Always test for PIPE_TRANSFER_READ/WRITE using the bit-wise and operator, and
add a pipe_transfer_buffer_flags() helper for getting the buffer usage flags
corresponding to them.
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 8296d56840..f2659ca61f 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -345,16 +345,9 @@ static void* r300_transfer_map(struct pipe_screen* screen, { struct r300_texture* tex = (struct r300_texture*)transfer->texture; char* map; - unsigned flags = 0; - if (transfer->usage != PIPE_TRANSFER_WRITE) { - flags |= PIPE_BUFFER_USAGE_CPU_READ; - } - if (transfer->usage != PIPE_TRANSFER_READ) { - flags |= PIPE_BUFFER_USAGE_CPU_WRITE; - } - - map = pipe_buffer_map(screen, tex->buffer, flags); + map = pipe_buffer_map(screen, tex->buffer, + pipe_transfer_buffer_flags(transfer)); if (!map) { return NULL; |