diff options
| author | Marek Olšák <[email protected]> | 2012-01-02 00:02:34 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-01-05 18:29:11 +0100 |
| commit | 7cd1c62b6be88072e3d937b67c499592490927f1 (patch) | |
| tree | 0a5a8e12e69c1787d90fcd01db0f57897d0152d1 /src/gallium/drivers | |
| parent | 5968e4068cdcb0551f1c519f236560bb44ea659e (diff) | |
gallium: remove deprecated PIPE_TRANSFER_DISCARD
PIPE_TRANSFER_DISCARD_RANGE is defined the same.
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen_buffer.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_buffer.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_resource_buffer_upload.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_swtnl_backend.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index 1abfa790072..3423451748a 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -31,7 +31,7 @@ nouveau_screen_transfer_flags(unsigned pipe) flags |= NOUVEAU_BO_RD; if (pipe & PIPE_TRANSFER_WRITE) flags |= NOUVEAU_BO_WR; - if (pipe & PIPE_TRANSFER_DISCARD) + if (pipe & PIPE_TRANSFER_DISCARD_RANGE) flags |= NOUVEAU_BO_INVAL; if (pipe & PIPE_TRANSFER_UNSYNCHRONIZED) flags |= NOUVEAU_BO_NOSYNC; diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c index 9d8ce62a6d2..37f6e8d53d8 100644 --- a/src/gallium/drivers/r300/r300_screen_buffer.c +++ b/src/gallium/drivers/r300/r300_screen_buffer.c @@ -161,7 +161,7 @@ static void r300_buffer_transfer_inline_write(struct pipe_context *pipe, assert(rbuf->b.user_ptr == NULL); map = rws->buffer_map(rbuf->buf, r300->cs, - PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage); + PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE | usage); memcpy(map + box->x, data, box->width); diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c index b7f0b24ec8c..4511a94bce5 100644 --- a/src/gallium/drivers/r600/r600_buffer.c +++ b/src/gallium/drivers/r600/r600_buffer.c @@ -127,7 +127,7 @@ static void r600_buffer_transfer_inline_write(struct pipe_context *pipe, assert(rbuffer->b.user_ptr == NULL); map = rctx->ws->buffer_map(rbuffer->buf, rctx->ctx.cs, - PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage); + PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE | usage); memcpy(map + box->x, data, box->width); diff --git a/src/gallium/drivers/svga/svga_resource_buffer_upload.c b/src/gallium/drivers/svga/svga_resource_buffer_upload.c index 36782d5d0d1..f4a96cba349 100644 --- a/src/gallium/drivers/svga/svga_resource_buffer_upload.c +++ b/src/gallium/drivers/svga/svga_resource_buffer_upload.c @@ -500,7 +500,7 @@ svga_buffer_upload_piecewise(struct svga_screen *ss, map = sws->buffer_map(sws, hwbuf, PIPE_TRANSFER_WRITE | - PIPE_TRANSFER_DISCARD); + PIPE_TRANSFER_DISCARD_RANGE); assert(map); if (map) { memcpy(map, sbuf->swbuf, size); diff --git a/src/gallium/drivers/svga/svga_swtnl_backend.c b/src/gallium/drivers/svga/svga_swtnl_backend.c index e149d21a47e..521226c0db7 100644 --- a/src/gallium/drivers/svga/svga_swtnl_backend.c +++ b/src/gallium/drivers/svga/svga_swtnl_backend.c @@ -126,7 +126,7 @@ svga_vbuf_render_map_vertices( struct vbuf_render *render ) svga_render->vbuf, PIPE_TRANSFER_WRITE | PIPE_TRANSFER_FLUSH_EXPLICIT | - PIPE_TRANSFER_DISCARD | + PIPE_TRANSFER_DISCARD_RANGE | PIPE_TRANSFER_UNSYNCHRONIZED, &svga_render->vbuf_transfer); if (ptr) |