diff options
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_cp_dma.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index 9fa3ccb6c27..ea999d9f654 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -434,7 +434,7 @@ static void cik_emit_prefetch_L2(struct si_context *sctx, struct r600_atom *atom if (sctx->vertex_buffer_pointer_dirty) { cik_prefetch_TC_L2_async(sctx, &sctx->vertex_buffers.buffer->b.b, sctx->vertex_buffers.buffer_offset, - sctx->vertex_elements->count * 16); + sctx->vertex_elements->desc_list_byte_size); } if (si_pm4_state_changed(sctx, ps)) cik_prefetch_shader_async(sctx, sctx->queued.named.ps); diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9acc4233b1f..b0faf421a44 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -961,7 +961,8 @@ bool si_upload_vertex_buffer_descriptors(struct si_context *sctx) * directly through a staging buffer and don't go through * the fine-grained upload path. */ - u_upload_alloc(sctx->b.uploader, 0, count * 16, 256, &desc->buffer_offset, + u_upload_alloc(sctx->b.uploader, 0, velems->desc_list_byte_size, 256, + &desc->buffer_offset, (struct pipe_resource**)&desc->buffer, (void**)&ptr); if (!desc->buffer) return false; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 5a163b14f16..1e0729c3b70 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3351,6 +3351,8 @@ static void *si_create_vertex_elements(struct pipe_context *ctx, return NULL; v->count = count; + v->desc_list_byte_size = align(count * 16, SI_CPDMA_ALIGNMENT); + for (i = 0; i < count; ++i) { const struct util_format_description *desc; const struct util_format_channel_description *channel; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 3f08f54a745..07b7d582752 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -100,6 +100,8 @@ struct si_vertex_element { unsigned count; unsigned first_vb_use_mask; + /* Vertex buffer descriptor list size aligned for optimal prefetch. */ + unsigned desc_list_byte_size; /* Two bits per attribute indicating the size of each vector component * in bytes if the size 3-workaround must be applied. |