diff options
| author | Marek Olšák <[email protected]> | 2017-03-12 14:17:25 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-05-15 13:01:33 +0200 |
| commit | 93d549b2af84158f25842fd08b5882b041b33f62 (patch) | |
| tree | 513e3cc9625ad81ebb763d86ad27e8f9d979aeed /src | |
| parent | e11f7e1d5996532228c6494ff9e93431c5506ef5 (diff) | |
gallium/radeon: handle other map buffer flags from the threaded context
Reviewed-by: Nicolai Hähnle <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_buffer_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c index 4132858b1fc..5d984ea8066 100644 --- a/src/gallium/drivers/radeon/r600_buffer_common.c +++ b/src/gallium/drivers/radeon/r600_buffer_common.c @@ -354,7 +354,8 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, /* See if the buffer range being mapped has never been initialized, * in which case it can be mapped unsynchronized. */ - if (!(usage & PIPE_TRANSFER_UNSYNCHRONIZED) && + if (!(usage & (PIPE_TRANSFER_UNSYNCHRONIZED | + TC_TRANSFER_MAP_IGNORE_VALID_RANGE)) && usage & PIPE_TRANSFER_WRITE && !rbuffer->is_shared && !util_ranges_intersect(&rbuffer->valid_buffer_range, box->x, box->x + box->width)) { @@ -368,7 +369,8 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx, } if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE && - !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) { + !(usage & (PIPE_TRANSFER_UNSYNCHRONIZED | + TC_TRANSFER_MAP_NO_INVALIDATE))) { assert(usage & PIPE_TRANSFER_WRITE); if (r600_invalidate_buffer(rctx, rbuffer)) { |