fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 19:58:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: optimize the fallback for misaligned ushort indices

Browse source
This commit is contained in:
Marek Olšák 2010-12-19 02:54:43 +01:00
parent c87f82bc40
commit 237880463d
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/r300/r300_render.c
View file

@ -551,7 +551,27 @@ static void r300_draw_range_elements(struct pipe_context* pipe,
&start, count);
r300_update_derived_state(r300);
r300_upload_index_buffer(r300, &indexBuffer, indexSize, start, count, &new_offset);
/* Fallback for misaligned ushort indices. */
if (indexSize == 2 && start % 2 == 1) {
struct pipe_transfer *transfer;
struct pipe_resource *userbuf;
uint16_t *ptr = pipe_buffer_map(pipe, indexBuffer,
PIPE_TRANSFER_READ, &transfer);
/* Copy the mapped index buffer directly to the upload buffer.
* The start index will be aligned simply from the fact that
* every sub-buffer in u_upload_mgr is aligned. */
userbuf = pipe->screen->user_buffer_create(pipe->screen,
ptr + start, count * 2,
PIPE_BIND_INDEX_BUFFER);
indexBuffer = userbuf;
r300_upload_index_buffer(r300, &indexBuffer, indexSize, 0, count, &new_offset);
pipe_resource_reference(&userbuf, NULL);
pipe_buffer_unmap(pipe, indexBuffer, transfer);
} else {
r300_upload_index_buffer(r300, &indexBuffer, indexSize, start, count, &new_offset);
}
start = new_offset;

2
src/gallium/drivers/r300/r300_render_translate.c
View file

@ -204,7 +204,7 @@ void r300_translate_index_buffer(struct r300_context *r300,
break;
case 2:
if (*start % 2 != 0 || index_offset) {
if (index_offset) {
util_rebuild_ushort_elts(&r300->context, index_buffer, index_offset, *start, count);
*start = 0;
r300->validate_buffers = TRUE;