diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-07-17 14:34:50 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-07-23 13:33:42 +0200 |
| commit | 8e3e9d283976c30a8ba9b51821bc61ddf782e2b0 (patch) | |
| tree | e3087f09c219c3afe11a7626022e25d11dfe0a00 | |
| parent | 1ffe77e7bb2486ea74cda077ed2a9622b758395c (diff) | |
gallium/util: don't modify usage in pipe_buffer_write
All drivers were already doing it except virgl.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
| -rw-r--r-- | src/gallium/auxiliary/util/u_inlines.h | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/virgl/virgl_resource.c | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/gallium/auxiliary/util/u_inlines.h b/src/gallium/auxiliary/util/u_inlines.h index 07f73546ad7..c2a0b08d151 100644 --- a/src/gallium/auxiliary/util/u_inlines.h +++ b/src/gallium/auxiliary/util/u_inlines.h @@ -339,15 +339,8 @@ pipe_buffer_write(struct pipe_context *pipe, unsigned size, const void *data) { - unsigned access = PIPE_TRANSFER_WRITE; - - if (offset == 0 && size == buf->width0) { - access |= PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE; - } else { - access |= PIPE_TRANSFER_DISCARD_RANGE; - } - - pipe->buffer_subdata(pipe, buf, access, offset, size, data); + /* Don't set any other usage bits. Drivers should derive them. */ + pipe->buffer_subdata(pipe, buf, PIPE_TRANSFER_WRITE, offset, size, data); } /** diff --git a/src/gallium/drivers/virgl/virgl_resource.c b/src/gallium/drivers/virgl/virgl_resource.c index 441b0c11703..db5e7dd61af 100644 --- a/src/gallium/drivers/virgl/virgl_resource.c +++ b/src/gallium/drivers/virgl/virgl_resource.c @@ -89,6 +89,11 @@ static void virgl_buffer_subdata(struct pipe_context *pipe, { struct pipe_box box; + if (offset == 0 && size == resource->width0) + usage |= PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE; + else + usage |= PIPE_TRANSFER_DISCARD_RANGE; + u_box_1d(offset, size, &box); virgl_transfer_inline_write(pipe, resource, 0, usage, &box, data, 0, 0); } |