diff options
| author | Chia-I Wu <[email protected]> | 2014-07-28 12:56:02 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2014-07-28 22:57:22 +0800 |
| commit | b1dd54d9fe9983a409d6752f88daa3bc4d62046d (patch) | |
| tree | fc88cdb0df154646ea38bb9694392a031688fe16 | |
| parent | 2a82bb30e80637e91e261e85f9fe96f590d564fe (diff) | |
ilo: s/TRANSFER_MAP_UNSYNC/TRANSFER_MAP_GTT_UNSYNC/
It maps to drm_intel_gem_bo_map_unsynchronized(), which results in
unsynchronized GTT mapping.
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_transfer.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_transfer.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/ilo/ilo_transfer.c b/src/gallium/drivers/ilo/ilo_transfer.c index 161534363eb..f77f3f30458 100644 --- a/src/gallium/drivers/ilo/ilo_transfer.c +++ b/src/gallium/drivers/ilo/ilo_transfer.c @@ -165,7 +165,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_UNSYNC; + xfer->method = ILO_TRANSFER_MAP_GTT_UNSYNC; unblocked = true; } else if ((xfer->base.usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE) && @@ -177,7 +177,7 @@ xfer_unblock(struct ilo_transfer *xfer, bool *resource_renamed) /* TODO */ } break; - case ILO_TRANSFER_MAP_UNSYNC: + case ILO_TRANSFER_MAP_GTT_UNSYNC: unblocked = true; break; default: @@ -227,7 +227,7 @@ xfer_map(struct ilo_transfer *xfer) case ILO_TRANSFER_MAP_GTT: xfer->ptr = intel_bo_map_gtt(resource_get_bo(xfer->base.resource)); break; - case ILO_TRANSFER_MAP_UNSYNC: + case ILO_TRANSFER_MAP_GTT_UNSYNC: xfer->ptr = intel_bo_map_unsynchronized(resource_get_bo(xfer->base.resource)); break; @@ -253,7 +253,7 @@ xfer_unmap(struct ilo_transfer *xfer) switch (xfer->method) { case ILO_TRANSFER_MAP_CPU: case ILO_TRANSFER_MAP_GTT: - case ILO_TRANSFER_MAP_UNSYNC: + case ILO_TRANSFER_MAP_GTT_UNSYNC: intel_bo_unmap(resource_get_bo(xfer->base.resource)); break; default: @@ -892,7 +892,7 @@ tex_map(struct ilo_transfer *xfer) switch (xfer->method) { case ILO_TRANSFER_MAP_CPU: case ILO_TRANSFER_MAP_GTT: - case ILO_TRANSFER_MAP_UNSYNC: + case ILO_TRANSFER_MAP_GTT_UNSYNC: success = xfer_map(xfer); if (success) { 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 3ba4bacf749..22137cecab9 100644 --- a/src/gallium/drivers/ilo/ilo_transfer.h +++ b/src/gallium/drivers/ilo/ilo_transfer.h @@ -36,7 +36,7 @@ enum ilo_transfer_map_method { /* map() / map_gtt() / map_unsynchronized() */ ILO_TRANSFER_MAP_CPU, ILO_TRANSFER_MAP_GTT, - ILO_TRANSFER_MAP_UNSYNC, + ILO_TRANSFER_MAP_GTT_UNSYNC, /* use staging system buffer */ ILO_TRANSFER_MAP_SW_CONVERT, |