diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_transfer.c | 13 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_transfer.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/gallium/drivers/ilo/ilo_transfer.c b/src/gallium/drivers/ilo/ilo_transfer.c index a38708d88a6..de6f4324b9a 100644 --- a/src/gallium/drivers/ilo/ilo_transfer.c +++ b/src/gallium/drivers/ilo/ilo_transfer.c @@ -224,7 +224,7 @@ xfer_unblock(struct ilo_transfer *xfer, bool *resource_renamed) case ILO_TRANSFER_MAP_CPU: case ILO_TRANSFER_MAP_GTT: if (xfer->base.usage & PIPE_TRANSFER_UNSYNCHRONIZED) { - xfer->method = ILO_TRANSFER_MAP_GTT_UNSYNC; + xfer->method = ILO_TRANSFER_MAP_GTT_ASYNC; unblocked = true; } else if ((xfer->base.usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) && @@ -238,7 +238,7 @@ xfer_unblock(struct ilo_transfer *xfer, bool *resource_renamed) unblocked = true; } break; - case ILO_TRANSFER_MAP_GTT_UNSYNC: + case ILO_TRANSFER_MAP_GTT_ASYNC: case ILO_TRANSFER_MAP_STAGING: unblocked = true; break; @@ -291,9 +291,8 @@ xfer_map(struct ilo_transfer *xfer) case ILO_TRANSFER_MAP_GTT: ptr = intel_bo_map_gtt(ilo_resource_get_bo(xfer->base.resource)); break; - case ILO_TRANSFER_MAP_GTT_UNSYNC: - ptr = intel_bo_map_unsynchronized( - ilo_resource_get_bo(xfer->base.resource)); + case ILO_TRANSFER_MAP_GTT_ASYNC: + ptr = intel_bo_map_gtt_async(ilo_resource_get_bo(xfer->base.resource)); break; case ILO_TRANSFER_MAP_STAGING: { @@ -337,7 +336,7 @@ xfer_unmap(struct ilo_transfer *xfer) switch (xfer->method) { case ILO_TRANSFER_MAP_CPU: case ILO_TRANSFER_MAP_GTT: - case ILO_TRANSFER_MAP_GTT_UNSYNC: + case ILO_TRANSFER_MAP_GTT_ASYNC: intel_bo_unmap(ilo_resource_get_bo(xfer->base.resource)); break; case ILO_TRANSFER_MAP_STAGING: @@ -953,7 +952,7 @@ tex_map(struct ilo_transfer *xfer) switch (xfer->method) { case ILO_TRANSFER_MAP_CPU: case ILO_TRANSFER_MAP_GTT: - case ILO_TRANSFER_MAP_GTT_UNSYNC: + case ILO_TRANSFER_MAP_GTT_ASYNC: ptr = xfer_map(xfer); if (ptr) { const struct ilo_texture *tex = ilo_texture(xfer->base.resource); diff --git a/src/gallium/drivers/ilo/ilo_transfer.h b/src/gallium/drivers/ilo/ilo_transfer.h index d7f4838d384..e41edc1aa53 100644 --- a/src/gallium/drivers/ilo/ilo_transfer.h +++ b/src/gallium/drivers/ilo/ilo_transfer.h @@ -39,10 +39,10 @@ #define ILO_TRANSFER_MAP_BUFFER_ALIGNMENT 64 enum ilo_transfer_map_method { - /* map() / map_gtt() / map_unsynchronized() */ + /* map() / map_gtt() / map_gtt_async() */ ILO_TRANSFER_MAP_CPU, ILO_TRANSFER_MAP_GTT, - ILO_TRANSFER_MAP_GTT_UNSYNC, + ILO_TRANSFER_MAP_GTT_ASYNC, /* use staging resource */ ILO_TRANSFER_MAP_STAGING, |