KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: deal with high vertex buffer memory usage correctly 

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-07-29 17:28:43 +02:00
parent e62caf576e
commit d82cfab84c
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@ -855,7 +855,7 @@ static void si_vertex_buffers_begin_new_cs(struct si_context *sctx)
RADEON_PRIO_DESCRIPTORS);
}
static bool si_upload_vertex_buffer_descriptors(struct si_context *sctx)
bool si_upload_vertex_buffer_descriptors(struct si_context *sctx)
{
struct si_descriptors *desc = &sctx->vertex_buffers;
bool bound[SI_NUM_VERTEX_BUFFERS] = {};
@ -1801,8 +1801,7 @@ bool si_upload_graphics_shader_descriptors(struct si_context *sctx)
}
sctx->descriptors_dirty &= ~mask;
return si_upload_vertex_buffer_descriptors(sctx);
return true;
}
bool si_upload_compute_shader_descriptors(struct si_context *sctx)

1
src/gallium/drivers/radeonsi/si_state.h
View File

@ -287,6 +287,7 @@ void si_set_ring_buffer(struct pipe_context *ctx, uint slot,
bool add_tid, bool swizzle,
unsigned element_size, unsigned index_stride, uint64_t offset);
void si_init_all_descriptors(struct si_context *sctx);
bool si_upload_vertex_buffer_descriptors(struct si_context *sctx);
bool si_upload_graphics_shader_descriptors(struct si_context *sctx);
bool si_upload_compute_shader_descriptors(struct si_context *sctx);
void si_release_all_descriptors(struct si_context *sctx);

7
src/gallium/drivers/radeonsi/si_state_draw.c
View File

@ -997,6 +997,13 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
si_need_cs_space(sctx);
/* Since we've called r600_context_add_resource_size for vertex buffers,
* this must be called after si_need_cs_space, because we must let
* need_cs_space flush before we add buffers to the buffer list.
*/
if (!si_upload_vertex_buffer_descriptors(sctx))
return;
/* Emit states. */
mask = sctx->dirty_atoms;
while (mask) {