diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-07-29 17:28:43 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-08-06 13:56:14 +0200 |
| commit | d82cfab84c6b202e09180961959306acd50bd786 (patch) | |
| tree | 3926a00c4a42a3e5098dfcd2a35a8e4dc6d9b76c /src/gallium/drivers/radeonsi/si_state_draw.c | |
| parent | e62caf576e1c521d4d80c359f040a9978596e27d (diff) | |
| download | external_mesa3d-d82cfab84c6b202e09180961959306acd50bd786.zip external_mesa3d-d82cfab84c6b202e09180961959306acd50bd786.tar.gz external_mesa3d-d82cfab84c6b202e09180961959306acd50bd786.tar.bz2 | |
radeonsi: deal with high vertex buffer memory usage correctly
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state_draw.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index e4af4c7..d743e22 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -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) { |