diff options
| author | Marek Olšák <[email protected]> | 2016-07-16 21:19:48 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-07-23 13:33:42 +0200 |
| commit | 1ffe77e7bb2486ea74cda077ed2a9622b758395c (patch) | |
| tree | 4a04818614fc8c4e086e9dcd32dbadecbac4b6fb /src/mesa | |
| parent | 0ba7288376dc66f932336862c8a6abb629b47686 (diff) | |
gallium: split transfer_inline_write into buffer and texture callbacks
to reduce the call indirections with u_resource_vtbl.
The worst call tree you could get was:
- u_transfer_inline_write_vtbl
- u_default_transfer_inline_write
- u_transfer_map_vtbl
- driver_transfer_map
- u_transfer_unmap_vtbl
- driver_transfer_unmap
That's 6 indirect calls. Some drivers only had 5. The goal is to have
1 indirect call for drivers that care. The resource type can be determined
statically at most call sites.
The new interface is:
pipe_context::buffer_subdata(ctx, resource, usage, offset, size, data)
pipe_context::texture_subdata(ctx, resource, level, usage, box, data,
stride, layer_stride)
v2: fix whitespace, correct ilo's behavior
Reviewed-by: Nicolai Hähnle <[email protected]>
Acked-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_bufferobjects.c | 9 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index 1a8aea3c198..2d4c82148c8 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -196,12 +196,9 @@ st_bufferobj_data(struct gl_context *ctx, * This should be the same as creating a new buffer, but we avoid * a lot of validation in Mesa. */ - struct pipe_box box; - - u_box_1d(0, size, &box); - pipe->transfer_inline_write(pipe, st_obj->buffer, 0, - PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE, - &box, data, 0, 0); + pipe->buffer_subdata(pipe, st_obj->buffer, + PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE, + 0, size, data); return GL_TRUE; } else if (screen->get_param(screen, PIPE_CAP_INVALIDATE_BUFFER)) { pipe->invalidate_resource(pipe, st_obj->buffer); diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index a76775f6ded..d2acc71b81c 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1339,7 +1339,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims, if (!dst) goto fallback; - /* Try transfer_inline_write, which should be the fastest memcpy path. */ + /* Try texture_subdata, which should be the fastest memcpy path. */ if (pixels && !_mesa_is_bufferobj(unpack->BufferObj) && _mesa_texstore_can_use_memcpy(ctx, texImage->_BaseFormat, @@ -1365,8 +1365,8 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims, } u_box_3d(xoffset, yoffset, zoffset + dstz, width, height, depth, &box); - pipe->transfer_inline_write(pipe, dst, dst_level, 0, - &box, data, stride, layer_stride); + pipe->texture_subdata(pipe, dst, dst_level, 0, + &box, data, stride, layer_stride); return; } |