OSDN Git Service

radeonsi: handle dummy constant buffer allocation failure
authorMarek Olšák <marek.olsak@amd.com>
Thu, 10 Sep 2015 17:25:14 +0000 (19:25 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 7 Oct 2015 13:41:30 +0000 (14:41 +0100)
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>
(cherry picked from commit ae418a7b5640aadb625bb7a7d6e4aa0a98ccb77f)

src/gallium/drivers/radeonsi/si_pipe.c

index ec8cce4..939ac66 100644 (file)
@@ -170,6 +170,8 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, void *
        if (sctx->b.chip_class == CIK) {
                sctx->null_const_buf.buffer = pipe_buffer_create(screen, PIPE_BIND_CONSTANT_BUFFER,
                                                                 PIPE_USAGE_DEFAULT, 16);
+               if (!sctx->null_const_buf.buffer)
+                       goto fail;
                sctx->null_const_buf.buffer_size = sctx->null_const_buf.buffer->width0;
 
                for (shader = 0; shader < SI_NUM_SHADERS; shader++) {