diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-09-10 17:42:31 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-09-24 19:51:42 +0200 |
| commit | 29dff6f67656c8e6e09249cc76b6efa0c03353a7 (patch) | |
| tree | e599986890f1e819a0529beaf0bc21313e6a130a /src/gallium/drivers/radeonsi/si_state_draw.c | |
| parent | f3a081953393c7d40bd8df9ec22a2551d01098f5 (diff) | |
| download | external_mesa3d-29dff6f67656c8e6e09249cc76b6efa0c03353a7.zip external_mesa3d-29dff6f67656c8e6e09249cc76b6efa0c03353a7.tar.gz external_mesa3d-29dff6f67656c8e6e09249cc76b6efa0c03353a7.tar.bz2 | |
radeonsi: handle index buffer alloc failures
Cc: 11.0 <mesa-stable@lists.freedesktop.org>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state_draw.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 8cb98d7..b4c59f8 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -782,6 +782,10 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) u_upload_alloc(sctx->b.uploader, start_offset, count * 2, &out_offset, &out_buffer, &ptr); + if (!out_buffer) { + pipe_resource_reference(&ib.buffer, NULL); + return; + } util_shorten_ubyte_elts_to_userptr(&sctx->b.b, &ib, 0, ib.offset + start_offset, @@ -802,6 +806,8 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) u_upload_data(sctx->b.uploader, start_offset, count * ib.index_size, (char*)ib.user_buffer + start_offset, &ib.offset, &ib.buffer); + if (!ib.buffer) + return; /* info->start will be added by the drawing code */ ib.offset -= start_offset; } |