Module: Mesa
Branch: master
Commit: b1dd54d9fe9983a409d6752f88daa3bc4d62046d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1dd54d9fe9983a409d6752f88daa3bc4d62046d
Author: Chia-I Wu <olva...@gmail.com>
Date: Mon Jul 28 12:56:02 2014 +0800
ilo: s/TRANSFER_MAP_UNSYNC/TRANSFER_MAP_GTT_UNSYNC/
It maps to drm_intel_gem_bo_map_unsynchronized(), which results in
unsynchronized GTT mapping.
---
src/gallium/drivers/ilo/ilo_transfer.c | 10 +++++-----
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 1615343..f77f3f3 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 3ba4bac..22137ce 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,
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
