diff options
author | Marek Olšák <[email protected]> | 2012-03-05 13:45:00 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2012-03-05 13:47:49 +0100 |
commit | 62f44f670bb0162e89fd4786af877f8da9ff607c (patch) | |
tree | 4c6e6a1743a19d17f5667c1a3a290802c2637298 /src/gallium/drivers/i915 | |
parent | 058fc6521e3bc483bc948cc90dc5ee3b08d6ec64 (diff) |
Revert "gallium: add flag PIPE_TRANSFER_MAP_PERMANENTLY"
This reverts commit 0950086376b1c8b7fb89eda81ed7f2f06dee58bc.
It was decided to refactor the transfer API instead of adding workarounds
to address the performance issues.
Diffstat (limited to 'src/gallium/drivers/i915')
-rw-r--r-- | src/gallium/drivers/i915/i915_resource_buffer.c | 7 | ||||
-rw-r--r-- | src/gallium/drivers/i915/i915_resource_texture.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/gallium/drivers/i915/i915_resource_buffer.c b/src/gallium/drivers/i915/i915_resource_buffer.c index c54e481698e..77c03450b3a 100644 --- a/src/gallium/drivers/i915/i915_resource_buffer.c +++ b/src/gallium/drivers/i915/i915_resource_buffer.c @@ -68,13 +68,8 @@ i915_get_transfer(struct pipe_context *pipe, const struct pipe_box *box) { struct i915_context *i915 = i915_context(pipe); - struct pipe_transfer *transfer; + struct pipe_transfer *transfer = util_slab_alloc(&i915->transfer_pool); - if (usage & PIPE_TRANSFER_MAP_PERMANENTLY) { - return NULL; - } - - transfer = util_slab_alloc(&i915->transfer_pool); if (transfer == NULL) return NULL; diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c index 64d071c9d53..8ff733a7be5 100644 --- a/src/gallium/drivers/i915/i915_resource_texture.c +++ b/src/gallium/drivers/i915/i915_resource_texture.c @@ -720,14 +720,9 @@ i915_texture_get_transfer(struct pipe_context *pipe, { struct i915_context *i915 = i915_context(pipe); struct i915_texture *tex = i915_texture(resource); - struct i915_transfer *transfer; + struct i915_transfer *transfer = util_slab_alloc(&i915->texture_transfer_pool); boolean use_staging_texture = FALSE; - if (usage & PIPE_TRANSFER_MAP_PERMANENTLY) { - return NULL; - } - - transfer = util_slab_alloc(&i915->texture_transfer_pool); if (transfer == NULL) return NULL; |