diff options
| author | Marek Olšák <[email protected]> | 2015-09-10 17:42:31 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-10-07 14:08:18 +0100 |
| commit | f2e8b94f847193fc703a6f536c97c6f6503b3651 (patch) | |
| tree | c1262ccadef5cc2e9b656865080a0ef093770eb6 /src/gallium/drivers | |
| parent | 02a631bfbce25aab715d54a94097006c07c352de (diff) | |
radeonsi: handle constant buffer alloc failures
Cc: 11.0 <[email protected]>
Acked-by: Christian König <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
(cherry picked from commit cd27ff6a0f85ca35f0f7f2fa7971692e0028e2ed)
Diffstat (limited to 'src/gallium/drivers')
| -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 890be071596..a02c9bd763c 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -468,7 +468,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, @@ -500,6 +501,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); |