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 | cd27ff6a0f85ca35f0f7f2fa7971692e0028e2ed (patch) | |
| tree | 56cbf72f6d04ef31da1a39724e7b459e4caff45c /src/gallium | |
| parent | 29dff6f67656c8e6e09249cc76b6efa0c03353a7 (diff) | |
| download | external_mesa3d-cd27ff6a0f85ca35f0f7f2fa7971692e0028e2ed.zip external_mesa3d-cd27ff6a0f85ca35f0f7f2fa7971692e0028e2ed.tar.gz external_mesa3d-cd27ff6a0f85ca35f0f7f2fa7971692e0028e2ed.tar.bz2 | |
radeonsi: handle constant 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')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 92a7068..b07ab3b 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -472,7 +472,8 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf u_upload_alloc(sctx->b.uploader, 0, size, const_offset, (struct pipe_resource**)rbuffer, &tmp); - util_memcpy_cpu_to_le32(tmp, ptr, size); + if (rbuffer) + util_memcpy_cpu_to_le32(tmp, ptr, size); } static void si_set_constant_buffer(struct pipe_context *ctx, uint shader, uint slot, @@ -504,6 +505,11 @@ static void si_set_constant_buffer(struct pipe_context *ctx, uint shader, uint s si_upload_const_buffer(sctx, (struct r600_resource**)&buffer, input->user_buffer, input->buffer_size, &buffer_offset); + if (!buffer) { + /* Just unbind on failure. */ + si_set_constant_buffer(ctx, shader, slot, NULL); + return; + } va = r600_resource(buffer)->gpu_address + buffer_offset; } else { pipe_resource_reference(&buffer, input->buffer); |