diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-28 18:59:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-12 13:32:43 +1000 |
| commit | b5fcf0c8e07e666523b007fab1d0fc18c2c89241 (patch) | |
| tree | 2cd8fdfbe697531b04a9912e296df70d554db509 /src/gallium/drivers/r600/r600_buffer.c | |
| parent | 95555ed03e95f7472ad1f6c4b43e0aa7aaa13f93 (diff) | |
pb: add void * for flush ctx to mapping functions
If the buffer we are attempting to map is referenced by the unsubmitted
command stream for this context, we need to flush the command stream,
however to do that we need to be able to access the context at the lowest
level map function, currently we set the buffer in the toplevel map, but this
racy between context. (we probably have a lot more issues than that.)
I'll look into a proper solution as suggested by jrfonseca when I get some time.
Diffstat (limited to 'src/gallium/drivers/r600/r600_buffer.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c index d8188ae656..06197d3d7d 100644 --- a/src/gallium/drivers/r600/r600_buffer.c +++ b/src/gallium/drivers/r600/r600_buffer.c @@ -156,7 +156,7 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe, int write = 0; if (rbuffer->pb) { - return (uint8_t*)pb_map(rbuffer->pb, transfer->usage) + transfer->box.x; + return (uint8_t*)pb_map(rbuffer->pb, transfer->usage, NULL) + transfer->box.x; } if (transfer->usage & PIPE_TRANSFER_DONTBLOCK) { /* FIXME */ |